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

Save current menu to temp variable when entering options from in-game

Browse Source 
This is to pre-emptively prevent piling up stack frames for what I'll be
adding next, which is pressing Esc in the options menu in-game
automatically moving you back to MAPMODE.
This commit is contained in:
Misa
2020-06-22 17:23:56 -07:00
committed by Ethan Lee
parent 75326ca2ee
commit 6582801dc9
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
desktop_version/src/Input.cpp
View File

@@ -375,15 +375,16 @@ void menuactionpress()
default:
//back
music.playef(11);
game.returnmenu();
if (game.ingame_titlemode)
{
game.ingame_titlemode = false;
game.returntomenu(game.kludge_ingametemp);
game.gamestate = MAPMODE;
map.kludge_to_bg();
}
else
{
game.returnmenu();
map.nexttowercolour();
}
break;
@@ -590,15 +591,16 @@ void menuactionpress()
{
//back
music.playef(11);
game.returnmenu();
if (game.ingame_titlemode)
{
game.ingame_titlemode = false;
game.returntomenu(game.kludge_ingametemp);
game.gamestate = MAPMODE;
map.kludge_to_bg();
}
else
{
game.returnmenu();
map.nexttowercolour();
}
}
@@ -2122,6 +2124,7 @@ void mapmenuactionpress()
game.createmenu(Menu::options);
}
map.bg_to_kludge();
game.kludge_ingametemp = game.currentmenuname;
map.nexttowercolour();
map.scrolldir = 0;