mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-09 10:29:45 +01:00
Code Issues Releases Wiki Activity

Fix 1-frame text glitch when returning to editor settings from options

Browse source 
The returnmenu() needs to be deferred until the end of the frame.
This commit is contained in:
Misa 2021-03-18 21:11:52 -07:00 committed by Ethan Lee
parent 8a3e292041
commit 5088ff40e9
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
desktop_version/src/Game.cpp
View file

@ -6624,6 +6624,14 @@ static void returntoingametemp(void)
game.returntomenu(game.kludge_ingametemp); game.returntomenu(game.kludge_ingametemp);
} }
#if !defined(NO_CUSTOM_LEVELS) && !defined(NO_EDITOR)
static void returntoedsettings(void)
{
extern Game game;
game.returntomenu(Menu::ed_settings);
}
#endif
void Game::returntoingame(void) void Game::returntoingame(void)
{ {
ingame_titlemode = false; ingame_titlemode = false;
@ -6632,7 +6640,7 @@ void Game::returntoingame(void)
if (ingame_editormode) if (ingame_editormode)
{ {
ingame_editormode = false; ingame_editormode = false;
returntomenu(Menu::ed_settings); DEFER_CALLBACK(returntoedsettings);
gamestate = EDITORMODE; gamestate = EDITORMODE;
ed.settingskey = true; ed.settingskey = true;
} }