1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00

Prevent changing language if a textbox is displayed

I really thought I was going to need to block changing the language
in-game altogether, but activity zone prompts are now fixed and the
only obvious problem I can think of right now is having a dialogue
open, so I just disable the language option if a textbox is displayed.
(like how the map menu only has the save option if a script is running)
This commit is contained in:
Dav999 2023-08-31 04:36:46 +02:00 committed by Misa Elizabeth Kai
parent 700aa4aaa0
commit 4ae6c77110
19 changed files with 53 additions and 23 deletions

View file

@ -51,7 +51,8 @@
<string english="Change controller options." translation="Canvia les opcions del controlador." explanation="" max="38*2"/> <string english="Change controller options." translation="Canvia les opcions del controlador." explanation="" max="38*2"/>
<string english="language" translation="llengua" explanation="menu option"/> <string english="language" translation="llengua" explanation="menu option"/>
<string english="Language" translation="Llengua" explanation="title" max="20"/> <string english="Language" translation="Llengua" explanation="title" max="20"/>
<string english="Change the language." translation="Canvia la llengua." explanation="" max="38*5"/> <string english="Change the language." translation="Canvia la llengua." explanation="" max="38*2"/>
<string english="Can not change the language while a textbox is displayed in-game." translation="" explanation="" max="38*3"/>
<string english="clear main game data" translation="esborra dades de partides" explanation="menu option"/> <string english="clear main game data" translation="esborra dades de partides" explanation="menu option"/>
<string english="clear custom level data" translation="esborra dades de niv. person." explanation="menu option"/> <string english="clear custom level data" translation="esborra dades de niv. person." explanation="menu option"/>
<string english="Clear Data" translation="Esborra dades" explanation="title" max="20"/> <string english="Clear Data" translation="Esborra dades" explanation="title" max="20"/>

View file

@ -51,7 +51,8 @@
<string english="Change controller options." translation="Newid opsiynau rheolydd." explanation="" max="38*2"/> <string english="Change controller options." translation="Newid opsiynau rheolydd." explanation="" max="38*2"/>
<string english="language" translation="iaith" explanation="menu option"/> <string english="language" translation="iaith" explanation="menu option"/>
<string english="Language" translation="Iaith" explanation="title" max="20"/> <string english="Language" translation="Iaith" explanation="title" max="20"/>
<string english="Change the language." translation="Newid yr iaith." explanation="" max="38*5"/> <string english="Change the language." translation="Newid yr iaith." explanation="" max="38*2"/>
<string english="Can not change the language while a textbox is displayed in-game." translation="" explanation="" max="38*3"/>
<string english="clear main game data" translation="clirio data prif gêm" explanation="menu option"/> <string english="clear main game data" translation="clirio data prif gêm" explanation="menu option"/>
<string english="clear custom level data" translation="clirio data lefel cwstwm" explanation="menu option"/> <string english="clear custom level data" translation="clirio data lefel cwstwm" explanation="menu option"/>
<string english="Clear Data" translation="Clirio Data" explanation="title" max="20"/> <string english="Clear Data" translation="Clirio Data" explanation="title" max="20"/>

View file

@ -51,7 +51,8 @@
<string english="Change controller options." translation="Ändere Controller-Optionen." explanation="" max="38*2"/> <string english="Change controller options." translation="Ändere Controller-Optionen." explanation="" max="38*2"/>
<string english="language" translation="sprache" explanation="menu option"/> <string english="language" translation="sprache" explanation="menu option"/>
<string english="Language" translation="Sprache" explanation="title" max="20"/> <string english="Language" translation="Sprache" explanation="title" max="20"/>
<string english="Change the language." translation="Ändere die Spielsprache." explanation="" max="38*5"/> <string english="Change the language." translation="Ändere die Spielsprache." explanation="" max="38*2"/>
<string english="Can not change the language while a textbox is displayed in-game." translation="" explanation="" max="38*3"/>
<string english="clear main game data" translation="hauptspieldaten löschen" explanation="menu option"/> <string english="clear main game data" translation="hauptspieldaten löschen" explanation="menu option"/>
<string english="clear custom level data" translation="eigene-level-daten löschen" explanation="menu option"/> <string english="clear custom level data" translation="eigene-level-daten löschen" explanation="menu option"/>
<string english="Clear Data" translation="Daten löschen" explanation="title" max="20"/> <string english="Clear Data" translation="Daten löschen" explanation="title" max="20"/>

View file

@ -51,7 +51,8 @@
<string english="Change controller options." translation="" explanation="" max="38*2"/> <string english="Change controller options." translation="" explanation="" max="38*2"/>
<string english="language" translation="" explanation="menu option"/> <string english="language" translation="" explanation="menu option"/>
<string english="Language" translation="" explanation="title" max="20"/> <string english="Language" translation="" explanation="title" max="20"/>
<string english="Change the language." translation="" explanation="" max="38*5"/> <string english="Change the language." translation="" explanation="" max="38*2"/>
<string english="Can not change the language while a textbox is displayed in-game." translation="" explanation="" max="38*3"/>
<string english="clear main game data" translation="" explanation="menu option"/> <string english="clear main game data" translation="" explanation="menu option"/>
<string english="clear custom level data" translation="" explanation="menu option"/> <string english="clear custom level data" translation="" explanation="menu option"/>
<string english="Clear Data" translation="" explanation="title" max="20"/> <string english="Clear Data" translation="" explanation="title" max="20"/>

View file

@ -51,7 +51,8 @@
<string english="Change controller options." translation="Ŝanĝi regilajn agordojn." explanation="" max="38*2"/> <string english="Change controller options." translation="Ŝanĝi regilajn agordojn." explanation="" max="38*2"/>
<string english="language" translation="lingvo" explanation="menu option"/> <string english="language" translation="lingvo" explanation="menu option"/>
<string english="Language" translation="Lingvo" explanation="title" max="20"/> <string english="Language" translation="Lingvo" explanation="title" max="20"/>
<string english="Change the language." translation="Ŝanĝi la lingvon." explanation="" max="38*5"/> <string english="Change the language." translation="Ŝanĝi la lingvon." explanation="" max="38*2"/>
<string english="Can not change the language while a textbox is displayed in-game." translation="" explanation="" max="38*3"/>
<string english="clear main game data" translation="viŝi datumojn ĉefludajn" explanation="menu option"/> <string english="clear main game data" translation="viŝi datumojn ĉefludajn" explanation="menu option"/>
<string english="clear custom level data" translation="viŝi datumojn ludantnivelajn" explanation="menu option"/> <string english="clear custom level data" translation="viŝi datumojn ludantnivelajn" explanation="menu option"/>
<string english="Clear Data" translation="Viŝi datumojn" explanation="title" max="20"/> <string english="Clear Data" translation="Viŝi datumojn" explanation="title" max="20"/>

View file

@ -51,7 +51,8 @@
<string english="Change controller options." translation="Cambia las opciones del mando." explanation="" max="38*2"/> <string english="Change controller options." translation="Cambia las opciones del mando." explanation="" max="38*2"/>
<string english="language" translation="idioma" explanation="menu option"/> <string english="language" translation="idioma" explanation="menu option"/>
<string english="Language" translation="Idioma" explanation="title" max="20"/> <string english="Language" translation="Idioma" explanation="title" max="20"/>
<string english="Change the language." translation="Cambia el idioma." explanation="" max="38*5"/> <string english="Change the language." translation="Cambia el idioma." explanation="" max="38*2"/>
<string english="Can not change the language while a textbox is displayed in-game." translation="" explanation="" max="38*3"/>
<string english="clear main game data" translation="borrar datos de juego" explanation="menu option"/> <string english="clear main game data" translation="borrar datos de juego" explanation="menu option"/>
<string english="clear custom level data" translation="borrar datos de niveles" explanation="menu option"/> <string english="clear custom level data" translation="borrar datos de niveles" explanation="menu option"/>
<string english="Clear Data" translation="Borrar datos" explanation="title" max="20"/> <string english="Clear Data" translation="Borrar datos" explanation="title" max="20"/>

View file

@ -51,7 +51,8 @@
<string english="Change controller options." translation="Modifiez les options de votre manette." explanation="" max="38*2"/> <string english="Change controller options." translation="Modifiez les options de votre manette." explanation="" max="38*2"/>
<string english="language" translation="langue" explanation="menu option"/> <string english="language" translation="langue" explanation="menu option"/>
<string english="Language" translation="Langue" explanation="title" max="20"/> <string english="Language" translation="Langue" explanation="title" max="20"/>
<string english="Change the language." translation="Changez de langue." explanation="" max="38*5"/> <string english="Change the language." translation="Changez de langue." explanation="" max="38*2"/>
<string english="Can not change the language while a textbox is displayed in-game." translation="" explanation="" max="38*3"/>
<string english="clear main game data" translation="effacer les données principales" explanation="menu option"/> <string english="clear main game data" translation="effacer les données principales" explanation="menu option"/>
<string english="clear custom level data" translation="effacer les données personnalisées" explanation="menu option"/> <string english="clear custom level data" translation="effacer les données personnalisées" explanation="menu option"/>
<string english="Clear Data" translation="Effacer les données" explanation="title" max="20"/> <string english="Clear Data" translation="Effacer les données" explanation="title" max="20"/>

View file

@ -51,7 +51,8 @@
<string english="Change controller options." translation="Socruithe rialaitheora." explanation="" max="38*2"/> <string english="Change controller options." translation="Socruithe rialaitheora." explanation="" max="38*2"/>
<string english="language" translation="teanga" explanation="menu option"/> <string english="language" translation="teanga" explanation="menu option"/>
<string english="Language" translation="Teanga" explanation="title" max="20"/> <string english="Language" translation="Teanga" explanation="title" max="20"/>
<string english="Change the language." translation="Athraigh an teanga." explanation="" max="38*5"/> <string english="Change the language." translation="Athraigh an teanga." explanation="" max="38*2"/>
<string english="Can not change the language while a textbox is displayed in-game." translation="" explanation="" max="38*3"/>
<string english="clear main game data" translation="sonraí phríomhchuid an chluiche" explanation="menu option"/> <string english="clear main game data" translation="sonraí phríomhchuid an chluiche" explanation="menu option"/>
<string english="clear custom level data" translation="sonraí na leibhéal saincheaptha" explanation="menu option"/> <string english="clear custom level data" translation="sonraí na leibhéal saincheaptha" explanation="menu option"/>
<string english="Clear Data" translation="Scrios Sonraí" explanation="title" max="20"/> <string english="Clear Data" translation="Scrios Sonraí" explanation="title" max="20"/>

View file

@ -51,7 +51,8 @@
<string english="Change controller options." translation="Modifica le opzioni del controller." explanation="" max="38*2"/> <string english="Change controller options." translation="Modifica le opzioni del controller." explanation="" max="38*2"/>
<string english="language" translation="lingua" explanation="menu option"/> <string english="language" translation="lingua" explanation="menu option"/>
<string english="Language" translation="Lingua" explanation="title" max="20"/> <string english="Language" translation="Lingua" explanation="title" max="20"/>
<string english="Change the language." translation="Cambia la lingua." explanation="" max="38*5"/> <string english="Change the language." translation="Cambia la lingua." explanation="" max="38*2"/>
<string english="Can not change the language while a textbox is displayed in-game." translation="" explanation="" max="38*3"/>
<string english="clear main game data" translation="cancella dati gioco principale" explanation="menu option"/> <string english="clear main game data" translation="cancella dati gioco principale" explanation="menu option"/>
<string english="clear custom level data" translation="cancella dati livelli personalizzati" explanation="menu option"/> <string english="clear custom level data" translation="cancella dati livelli personalizzati" explanation="menu option"/>
<string english="Clear Data" translation="Cancella dati" explanation="title" max="20"/> <string english="Clear Data" translation="Cancella dati" explanation="title" max="20"/>

View file

@ -51,7 +51,8 @@
<string english="Change controller options." translation="Wijzig controlleropties." explanation="" max="38*2"/> <string english="Change controller options." translation="Wijzig controlleropties." explanation="" max="38*2"/>
<string english="language" translation="taal" explanation="menu option"/> <string english="language" translation="taal" explanation="menu option"/>
<string english="Language" translation="Taal" explanation="title" max="20"/> <string english="Language" translation="Taal" explanation="title" max="20"/>
<string english="Change the language." translation="Wijzig de taal." explanation="" max="38*5"/> <string english="Change the language." translation="Wijzig de taal." explanation="" max="38*2"/>
<string english="Can not change the language while a textbox is displayed in-game." translation="" explanation="" max="38*3"/>
<string english="clear main game data" translation="data hoofdspel wissen" explanation="menu option"/> <string english="clear main game data" translation="data hoofdspel wissen" explanation="menu option"/>
<string english="clear custom level data" translation="data spelerlevels wissen" explanation="menu option"/> <string english="clear custom level data" translation="data spelerlevels wissen" explanation="menu option"/>
<string english="Clear Data" translation="Data wissen" explanation="title" max="20"/> <string english="Clear Data" translation="Data wissen" explanation="title" max="20"/>

View file

@ -51,7 +51,8 @@
<string english="Change controller options." translation="Altere as opções do controle." explanation="" max="38*2"/> <string english="Change controller options." translation="Altere as opções do controle." explanation="" max="38*2"/>
<string english="language" translation="idioma" explanation="menu option"/> <string english="language" translation="idioma" explanation="menu option"/>
<string english="Language" translation="Idioma" explanation="title" max="20"/> <string english="Language" translation="Idioma" explanation="title" max="20"/>
<string english="Change the language." translation="Altere o idioma." explanation="" max="38*5"/> <string english="Change the language." translation="Altere o idioma." explanation="" max="38*2"/>
<string english="Can not change the language while a textbox is displayed in-game." translation="" explanation="" max="38*3"/>
<string english="clear main game data" translation="limpar dados principais do jogo" explanation="menu option"/> <string english="clear main game data" translation="limpar dados principais do jogo" explanation="menu option"/>
<string english="clear custom level data" translation="limpar dados de níveis" explanation="menu option"/> <string english="clear custom level data" translation="limpar dados de níveis" explanation="menu option"/>
<string english="Clear Data" translation="Apagar os dados" explanation="title" max="20"/> <string english="Clear Data" translation="Apagar os dados" explanation="title" max="20"/>

View file

@ -51,7 +51,8 @@
<string english="Change controller options." translation="Altera as opções do comando." explanation="" max="38*2"/> <string english="Change controller options." translation="Altera as opções do comando." explanation="" max="38*2"/>
<string english="language" translation="idioma" explanation="menu option"/> <string english="language" translation="idioma" explanation="menu option"/>
<string english="Language" translation="Idioma" explanation="title" max="20"/> <string english="Language" translation="Idioma" explanation="title" max="20"/>
<string english="Change the language." translation="Altera o idioma." explanation="" max="38*5"/> <string english="Change the language." translation="Altera o idioma." explanation="" max="38*2"/>
<string english="Can not change the language while a textbox is displayed in-game." translation="" explanation="" max="38*3"/>
<string english="clear main game data" translation="eliminar dados de jogo" explanation="menu option"/> <string english="clear main game data" translation="eliminar dados de jogo" explanation="menu option"/>
<string english="clear custom level data" translation="eliminar dados dos níveis" explanation="menu option"/> <string english="clear custom level data" translation="eliminar dados dos níveis" explanation="menu option"/>
<string english="Clear Data" translation="Eliminar Dados" explanation="title" max="20"/> <string english="Clear Data" translation="Eliminar Dados" explanation="title" max="20"/>

View file

@ -51,7 +51,8 @@
<string english="Change controller options." translation="Измените настройки контроллера." explanation="" max="38*2"/> <string english="Change controller options." translation="Измените настройки контроллера." explanation="" max="38*2"/>
<string english="language" translation="язык" explanation="menu option"/> <string english="language" translation="язык" explanation="menu option"/>
<string english="Language" translation="Язык" explanation="title" max="20"/> <string english="Language" translation="Язык" explanation="title" max="20"/>
<string english="Change the language." translation="Смените язык." explanation="" max="38*5"/> <string english="Change the language." translation="Смените язык." explanation="" max="38*2"/>
<string english="Can not change the language while a textbox is displayed in-game." translation="" explanation="" max="38*3"/>
<string english="clear main game data" translation="стереть данные основной игры" explanation="menu option"/> <string english="clear main game data" translation="стереть данные основной игры" explanation="menu option"/>
<string english="clear custom level data" translation="стереть данные пользов. уровней" explanation="menu option"/> <string english="clear custom level data" translation="стереть данные пользов. уровней" explanation="menu option"/>
<string english="Clear Data" translation="Стереть данные" explanation="title" max="20"/> <string english="Clear Data" translation="Стереть данные" explanation="title" max="20"/>

View file

@ -51,7 +51,8 @@
<string english="Change controller options." translation="Oyun kumandası seçeneklerini değiştir." explanation="" max="38*2"/> <string english="Change controller options." translation="Oyun kumandası seçeneklerini değiştir." explanation="" max="38*2"/>
<string english="language" translation="dil" explanation="menu option"/> <string english="language" translation="dil" explanation="menu option"/>
<string english="Language" translation="Dil" explanation="title" max="20"/> <string english="Language" translation="Dil" explanation="title" max="20"/>
<string english="Change the language." translation="Dili değiştir." explanation="" max="38*5"/> <string english="Change the language." translation="Dili değiştir." explanation="" max="38*2"/>
<string english="Can not change the language while a textbox is displayed in-game." translation="" explanation="" max="38*3"/>
<string english="clear main game data" translation="ana oyun verilerini temizle" explanation="menu option"/> <string english="clear main game data" translation="ana oyun verilerini temizle" explanation="menu option"/>
<string english="clear custom level data" translation="özel bölüm verilerini temizle" explanation="menu option"/> <string english="clear custom level data" translation="özel bölüm verilerini temizle" explanation="menu option"/>
<string english="Clear Data" translation="Verileri Temizle" explanation="title" max="20"/> <string english="Clear Data" translation="Verileri Temizle" explanation="title" max="20"/>

View file

@ -51,7 +51,8 @@
<string english="Change controller options." translation="Змінити налаштування контролера." explanation="" max="38*2"/> <string english="Change controller options." translation="Змінити налаштування контролера." explanation="" max="38*2"/>
<string english="language" translation="мова" explanation="menu option"/> <string english="language" translation="мова" explanation="menu option"/>
<string english="Language" translation="Мова" explanation="title" max="20"/> <string english="Language" translation="Мова" explanation="title" max="20"/>
<string english="Change the language." translation="Змінити мову." explanation="" max="38*5"/> <string english="Change the language." translation="Змінити мову." explanation="" max="38*2"/>
<string english="Can not change the language while a textbox is displayed in-game." translation="" explanation="" max="38*3"/>
<string english="clear main game data" translation="очистити дані основної гри" explanation="menu option"/> <string english="clear main game data" translation="очистити дані основної гри" explanation="menu option"/>
<string english="clear custom level data" translation="очистити дані користувацьких рівнів" explanation="menu option"/> <string english="clear custom level data" translation="очистити дані користувацьких рівнів" explanation="menu option"/>
<string english="Clear Data" translation="Очистити дані" explanation="title" max="20"/> <string english="Clear Data" translation="Очистити дані" explanation="title" max="20"/>

View file

@ -51,7 +51,8 @@
<string english="Change controller options." translation="改变控制器选项。" explanation="" max="38*2" max_local="25*1"/> <string english="Change controller options." translation="改变控制器选项。" explanation="" max="38*2" max_local="25*1"/>
<string english="language" translation="语言" explanation="menu option"/> <string english="language" translation="语言" explanation="menu option"/>
<string english="Language" translation="语言" explanation="title" max="20" max_local="13"/> <string english="Language" translation="语言" explanation="title" max="20" max_local="13"/>
<string english="Change the language." translation="变更语言。" explanation="" max="38*5" max_local="25*4"/> <string english="Change the language." translation="变更语言。" explanation="" max="38*2" max_local="25*1"/>
<string english="Can not change the language while a textbox is displayed in-game." translation="" explanation="" max="38*3" max_local="25*2"/>
<string english="clear main game data" translation="清除主游戏数据" explanation="menu option"/> <string english="clear main game data" translation="清除主游戏数据" explanation="menu option"/>
<string english="clear custom level data" translation="清除自制关卡数据" explanation="menu option"/> <string english="clear custom level data" translation="清除自制关卡数据" explanation="menu option"/>
<string english="Clear Data" translation="清除数据" explanation="title" max="20" max_local="13"/> <string english="Clear Data" translation="清除数据" explanation="title" max="20" max_local="13"/>

View file

@ -6503,7 +6503,7 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
option(loc::gettext("audio")); option(loc::gettext("audio"));
option(loc::gettext("game pad")); option(loc::gettext("game pad"));
option(loc::gettext("accessibility")); option(loc::gettext("accessibility"));
option(loc::gettext("language")); option(loc::gettext("language"), graphics.textboxes.empty());
option(loc::gettext("return")); option(loc::gettext("return"));
menuyoff = 0; menuyoff = 0;
maxspacing = 15; maxspacing = 15;

View file

@ -1033,11 +1033,18 @@ static void menuactionpress(void)
break; break;
case 5: case 5:
//language options //language options
if (graphics.textboxes.empty())
{
music.playef(Sound_VIRIDIAN); music.playef(Sound_VIRIDIAN);
loc::loadlanguagelist(); loc::loadlanguagelist();
game.createmenu(Menu::language); game.createmenu(Menu::language);
game.currentmenuoption = loc::languagelist_curlang; game.currentmenuoption = loc::languagelist_curlang;
map.nexttowercolour(); map.nexttowercolour();
}
else
{
music.playef(Sound_CRY);
}
break; break;
default: default:
/* Return */ /* Return */

View file

@ -381,8 +381,15 @@ static void menurender(void)
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Disable screen effects, enable slowdown modes or invincibility."), tr, tg, tb); font::print_wrap(PR_CEN, -1, 65, loc::gettext("Disable screen effects, enable slowdown modes or invincibility."), tr, tg, tb);
break; break;
case 5: case 5:
{
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Language"), tr, tg, tb); font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Language"), tr, tg, tb);
font::print_wrap(PR_CEN, -1, 65, loc::gettext("Change the language."), tr, tg, tb); int next_y = font::print_wrap(PR_CEN, -1, 65, loc::gettext("Change the language."), tr, tg, tb);
if (!graphics.textboxes.empty())
{
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Can not change the language while a textbox is displayed in-game."), tr, tg, tb);
}
}
} }
break; break;
case Menu::graphicoptions: case Menu::graphicoptions: