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

Improve quit-to-menu menu handling

Browse Source 
This stabilizes the code that handles the menu that you land on if you
press Esc and quit to the menu.

Instead of using Game::returnmenu(), we now use the new function
Game::returntomenu() to clearly express intent that we want to return to
a specific menu. So I've added another kludge variable
Game::wasinintermission for the was-in-intermission case.

Also, I made it so that if you didn't have a main game telesave or
quicksave, you just get brought back to the main menu. Because you
shouldn't be able to go to the play menu without a quicksave or
telesave.
This commit is contained in:
Misa
2020-04-25 19:21:23 -07:00
committed by Ethan Lee
parent 536184f394
commit 9fca3e111f
4 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
desktop_version/src/Game.cpp
View File

@@ -1345,11 +1345,28 @@ void Game::updatestate()
//or "who do you want to play the level with?"
//or "do you want cutscenes?"
//or the confirm-load-quicksave menu
if ((!wasintimetrial && !wasincustommode) || currentmenuname == Menu::quickloadlevel)
if (wasintimetrial)
{
returnmenu();
returntomenu(Menu::timetrials);
}
else if (wasinintermission)
{
returntomenu(Menu::intermissionmenu);
}
else if (wasincustommode)
{
returntomenu(Menu::levellist);
}
else if (game.telesummary != "" || game.quicksummary != "")
{
returntomenu(Menu::play);
}
else
{
createmenu(Menu::mainmenu);
}
wasintimetrial = false;
wasinintermission = false;
wasincustommode = false;
state = 0;
break;