mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-22 17:49:43 +01:00
Fix possible title screen from in-game if command-line playtesting
In 8484b36198
, I fixed the title screen
showing up if you go to the language screen from in-game, while not
having any language files. There was also one other possible way to get
this to happen that I missed though: if you do have language files, and
you have not set your language yet, and you start a playtest via the
command line (e.g. by using Ved), and you then change the language
from the in-game options. That is now fixed.
This commit is contained in:
parent
4ae6c77110
commit
fcf034583b
1 changed files with 5 additions and 7 deletions
|
@ -1037,6 +1037,7 @@ static void menuactionpress(void)
|
||||||
{
|
{
|
||||||
music.playef(Sound_VIRIDIAN);
|
music.playef(Sound_VIRIDIAN);
|
||||||
loc::loadlanguagelist();
|
loc::loadlanguagelist();
|
||||||
|
loc::pre_title_lang_menu = false;
|
||||||
game.createmenu(Menu::language);
|
game.createmenu(Menu::language);
|
||||||
game.currentmenuoption = loc::languagelist_curlang;
|
game.currentmenuoption = loc::languagelist_curlang;
|
||||||
map.nexttowercolour();
|
map.nexttowercolour();
|
||||||
|
@ -1114,16 +1115,13 @@ static void menuactionpress(void)
|
||||||
|
|
||||||
if (loc::pre_title_lang_menu)
|
if (loc::pre_title_lang_menu)
|
||||||
{
|
{
|
||||||
/* Make the title screen appear, we haven't seen it yet */
|
/* Make the title screen appear, we haven't seen it yet.
|
||||||
|
* game.returnmenu() works because Menu::mainmenu
|
||||||
|
* is created before the language menu. */
|
||||||
game.menustart = false;
|
game.menustart = false;
|
||||||
game.createmenu(Menu::mainmenu);
|
|
||||||
game.currentmenuoption = 0;
|
|
||||||
loc::pre_title_lang_menu = false;
|
loc::pre_title_lang_menu = false;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
game.returnmenu();
|
game.returnmenu();
|
||||||
}
|
|
||||||
map.nexttowercolour();
|
map.nexttowercolour();
|
||||||
game.savestatsandsettings_menu();
|
game.savestatsandsettings_menu();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue