mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-22 17:49:43 +01:00
Fix incorrect return code from game options and graphic options
Pressing return in gameplay options would send you back to the pause menu instead of the general options menu, and pressing return in graphic options would send you back to the pause menu instead of the general options menu, too. Additionally, pressing Esc in graphic options would also send you back to the pause menu instead of the general options menu. Like I said before, the menu system is still a bit hardcoded in some places, and these happened because Terry forgot to update them when he changed the menus around. Fixes #711.
This commit is contained in:
parent
d89ce76577
commit
eb9d3582d8
1 changed files with 5 additions and 20 deletions
|
@ -447,15 +447,8 @@ static void menuactionpress(void)
|
|||
default:
|
||||
//back
|
||||
music.playef(11);
|
||||
if (game.ingame_titlemode)
|
||||
{
|
||||
game.returntoingame();
|
||||
}
|
||||
else
|
||||
{
|
||||
game.returnmenu();
|
||||
map.nexttowercolour();
|
||||
}
|
||||
game.returnmenu();
|
||||
map.nexttowercolour();
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
@ -735,15 +728,8 @@ static void menuactionpress(void)
|
|||
else if (game.currentmenuoption == gameplayoptionsoffset + 4) {
|
||||
//return to previous menu
|
||||
music.playef(11);
|
||||
if (game.ingame_titlemode)
|
||||
{
|
||||
game.returntoingame();
|
||||
}
|
||||
else
|
||||
{
|
||||
game.returnmenu();
|
||||
map.nexttowercolour();
|
||||
}
|
||||
game.returnmenu();
|
||||
map.nexttowercolour();
|
||||
}
|
||||
|
||||
break;
|
||||
|
@ -1632,8 +1618,7 @@ void titleinput(void)
|
|||
else
|
||||
{
|
||||
if (game.ingame_titlemode
|
||||
&& (game.currentmenuname == Menu::options
|
||||
|| game.currentmenuname == Menu::graphicoptions))
|
||||
&& game.currentmenuname == Menu::options)
|
||||
{
|
||||
game.returntoingame();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue