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

Fix incorrect return code from game options and graphic options

Browse Source 
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:
Misa
2021-04-11 13:52:35 -07:00
committed by Ethan Lee
parent d89ce76577
commit eb9d3582d8
1 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
desktop_version/src/Input.cpp
View File

@@ -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();
}