mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-23 10:09:43 +01:00
Make returning from game/graphic options return to MAPMODE
This is so return doesn't just lead back to more TITLEMODE.
This commit is contained in:
parent
4c5b018f6c
commit
6d7bff61b2
3 changed files with 24 additions and 2 deletions
|
@ -389,6 +389,8 @@ void Game::init(void)
|
||||||
|
|
||||||
over30mode = false;
|
over30mode = false;
|
||||||
|
|
||||||
|
ingame_titlemode = false;
|
||||||
|
|
||||||
/* Terry's Patrons... */
|
/* Terry's Patrons... */
|
||||||
const char* superpatrons_arr[] = {
|
const char* superpatrons_arr[] = {
|
||||||
"Anders Ekermo",
|
"Anders Ekermo",
|
||||||
|
|
|
@ -404,6 +404,8 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
bool over30mode;
|
bool over30mode;
|
||||||
|
|
||||||
|
bool ingame_titlemode;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern Game game;
|
extern Game game;
|
||||||
|
|
|
@ -376,7 +376,15 @@ void menuactionpress()
|
||||||
//back
|
//back
|
||||||
music.playef(11);
|
music.playef(11);
|
||||||
game.returnmenu();
|
game.returnmenu();
|
||||||
map.nexttowercolour();
|
if (game.ingame_titlemode)
|
||||||
|
{
|
||||||
|
game.ingame_titlemode = false;
|
||||||
|
game.gamestate = MAPMODE;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
map.nexttowercolour();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -582,7 +590,15 @@ void menuactionpress()
|
||||||
//back
|
//back
|
||||||
music.playef(11);
|
music.playef(11);
|
||||||
game.returnmenu();
|
game.returnmenu();
|
||||||
map.nexttowercolour();
|
if (game.ingame_titlemode)
|
||||||
|
{
|
||||||
|
game.ingame_titlemode = false;
|
||||||
|
game.gamestate = MAPMODE;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
map.nexttowercolour();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#undef OFFSET
|
#undef OFFSET
|
||||||
break;
|
break;
|
||||||
|
@ -2093,6 +2109,7 @@ void mapmenuactionpress()
|
||||||
// Graphic options
|
// Graphic options
|
||||||
music.playef(11);
|
music.playef(11);
|
||||||
game.gamestate = TITLEMODE;
|
game.gamestate = TITLEMODE;
|
||||||
|
game.ingame_titlemode = true;
|
||||||
game.createmenu(Menu::graphicoptions);
|
game.createmenu(Menu::graphicoptions);
|
||||||
map.nexttowercolour();
|
map.nexttowercolour();
|
||||||
|
|
||||||
|
@ -2104,6 +2121,7 @@ void mapmenuactionpress()
|
||||||
// Game options
|
// Game options
|
||||||
music.playef(11);
|
music.playef(11);
|
||||||
game.gamestate = TITLEMODE;
|
game.gamestate = TITLEMODE;
|
||||||
|
game.ingame_titlemode = true;
|
||||||
game.createmenu(Menu::options);
|
game.createmenu(Menu::options);
|
||||||
map.nexttowercolour();
|
map.nexttowercolour();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue