mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2025-01-08 01:49:44 +01:00
Add asserts if ingame_titlemode
in unexpected places
The game will now assert if the main menu is created while ingame_titlemode is true, or if we attempt to load into a mode while it's true. And if assertions are disabled then it just stops doing it anyway. I don't think there's any way to get a glitched ingame_titlemode again, ever since I removed save data deletion taking you back to the main menu. But I've had enough bugs with the fact that we more-or-less use the same state for main menu options and in-game options, and that glitched ingame_titlemode bug DID just happen, so I'm taking precautions.
This commit is contained in:
parent
326d96b506
commit
fa19bc3832
2 changed files with 13 additions and 0 deletions
|
@ -5937,6 +5937,12 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
|
||||||
switch (t)
|
switch (t)
|
||||||
{
|
{
|
||||||
case Menu::mainmenu:
|
case Menu::mainmenu:
|
||||||
|
if (ingame_titlemode)
|
||||||
|
{
|
||||||
|
/* We shouldn't be here! */
|
||||||
|
SDL_assert(0 && "Entering main menu from in-game options!");
|
||||||
|
break;
|
||||||
|
}
|
||||||
#if !defined(MAKEANDPLAY)
|
#if !defined(MAKEANDPLAY)
|
||||||
option("play");
|
option("play");
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -288,6 +288,13 @@ static void startmode(const int mode)
|
||||||
|
|
||||||
static void handlefadetomode(void)
|
static void handlefadetomode(void)
|
||||||
{
|
{
|
||||||
|
if (game.ingame_titlemode)
|
||||||
|
{
|
||||||
|
/* We shouldn't be here! */
|
||||||
|
SDL_assert(0 && "Loading a mode from in-game options!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (fadetomodedelay > 0)
|
if (fadetomodedelay > 0)
|
||||||
{
|
{
|
||||||
--fadetomodedelay;
|
--fadetomodedelay;
|
||||||
|
|
Loading…
Reference in a new issue