From 9cfbd1ae5103f616eebb5d51356fd1ab0d06c629 Mon Sep 17 00:00:00 2001 From: Misa Date: Tue, 31 Aug 2021 15:33:20 -0700 Subject: [PATCH] Fix not-Flip-Mode flag turning off when returning from options menu We need to check for graphics.setflipmode, not graphics.flipmode, because graphics.flipmode only gets assigned at the end of the frame (due to the deferred callback). Otherwise, returning from the options menu would always turn flag 73 on, which would make you ineligible to get the Flip Mode trophy, even if you're in Flip Mode. --- desktop_version/src/Game.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index a29d1c8f..475ccce7 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -6874,7 +6874,7 @@ void Game::returntoingame(void) gamestate = MAPMODE; DEFER_CALLBACK(setflipmode); DEFER_CALLBACK(setfademode); - if (!map.custommode && !graphics.flipmode) + if (!map.custommode && !graphics.setflipmode) { obj.flags[73] = true; }