mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 10:09:43 +01:00
Code Issues Releases Wiki Activity

Make returning from game/graphic options return to MAPMODE

Browse source 
This is so return doesn't just lead back to more TITLEMODE.
This commit is contained in:
Misa 2020-06-22 16:51:16 -07:00 committed by Ethan Lee
parent 4c5b018f6c
commit 6d7bff61b2
3 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
desktop_version/src/Game.cpp
View file

@ -389,6 +389,8 @@ void Game::init(void)
over30mode = false;
ingame_titlemode = false;
/* Terry's Patrons... */
const char* superpatrons_arr[] = {
"Anders Ekermo",

2
desktop_version/src/Game.h
View file

@ -404,6 +404,8 @@ public:
}
bool over30mode;
bool ingame_titlemode;
};
extern Game game;

22
desktop_version/src/Input.cpp
View file

@ -376,7 +376,15 @@ void menuactionpress()
//back
music.playef(11);
game.returnmenu();
map.nexttowercolour();
if (game.ingame_titlemode)
{
game.ingame_titlemode = false;
game.gamestate = MAPMODE;
}
else
{
map.nexttowercolour();
}
break;
}
break;
@ -582,7 +590,15 @@ void menuactionpress()
//back
music.playef(11);
game.returnmenu();
map.nexttowercolour();
if (game.ingame_titlemode)
{
game.ingame_titlemode = false;
game.gamestate = MAPMODE;
}
else
{
map.nexttowercolour();
}
}
#undef OFFSET
break;
@ -2093,6 +2109,7 @@ void mapmenuactionpress()
// Graphic options
music.playef(11);
game.gamestate = TITLEMODE;
game.ingame_titlemode = true;
game.createmenu(Menu::graphicoptions);
map.nexttowercolour();
@ -2104,6 +2121,7 @@ void mapmenuactionpress()
// Game options
music.playef(11);
game.gamestate = TITLEMODE;
game.ingame_titlemode = true;
game.createmenu(Menu::options);
map.nexttowercolour();