mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-06-28 15:38:30 +02:00
Code Issues Releases Wiki Activity

Move returning to pause menu code to separate function

Browse Source 
This code is getting a bit more complicated now, we should maybe stop
copy-pasting it everywhere.
This commit is contained in:
Misa 2020-06-22 17:26:45 -07:00 committed by Ethan Lee
parent 6582801dc9
commit aa40eb6327
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
desktop_version/src/Game.cpp
View File

@ -7755,3 +7755,11 @@ void Game::returntoeditor()
map.scrolldir = 0; map.scrolldir = 0;
} }
#endif #endif
void Game::returntopausemenu()
{
ingame_titlemode = false;
returntomenu(kludge_ingametemp);
gamestate = MAPMODE;
map.kludge_to_bg();
}

2
desktop_version/src/Game.h
View File

@ -407,6 +407,8 @@ public:
bool over30mode; bool over30mode;
bool ingame_titlemode; bool ingame_titlemode;
void returntopausemenu();
}; };
extern Game game; extern Game game;

10
desktop_version/src/Input.cpp
View File

@ -377,10 +377,7 @@ void menuactionpress()
music.playef(11); music.playef(11);
if (game.ingame_titlemode) if (game.ingame_titlemode)
{ {
game.ingame_titlemode = false; game.returntopausemenu();
game.returntomenu(game.kludge_ingametemp);
game.gamestate = MAPMODE;
map.kludge_to_bg();
} }
else else
{ {
@ -593,10 +590,7 @@ void menuactionpress()
music.playef(11); music.playef(11);
if (game.ingame_titlemode) if (game.ingame_titlemode)
{ {
game.ingame_titlemode = false; game.returntopausemenu();
game.returntomenu(game.kludge_ingametemp);
game.gamestate = MAPMODE;
map.kludge_to_bg();
} }
else else
{ {