Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-29 17:38:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Prevent changing language if a textbox is displayed

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop_version/src/Game.cpp
View File

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

17
desktop_version/src/Input.cpp
View File

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

9
desktop_version/src/Render.cpp
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);
break;
case 5:
{
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;
case Menu::graphicoptions: