diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp index 5f2683f6..f9bb5cc0 100644 --- a/desktop_version/src/Logic.cpp +++ b/desktop_version/src/Logic.cpp @@ -43,25 +43,13 @@ void maplogic() if (graphics.resumegamemode) { graphics.menuoffset += 25; - if (map.extrarow) + int threshold = map.extrarow ? 230 : 240; + if (graphics.menuoffset >= threshold) { - if (graphics.menuoffset >= 230) - { - graphics.menuoffset = 230; - //go back to gamemode! - game.mapheld = true; - game.gamestate = GAMEMODE; - } - } - else - { - if (graphics.menuoffset >= 240) - { - graphics.menuoffset = 240; - //go back to gamemode! - game.mapheld = true; - game.gamestate = GAMEMODE; - } + graphics.menuoffset = threshold; + //go back to gamemode! + game.mapheld = true; + game.gamestate = GAMEMODE; } } else if (graphics.menuoffset > 0) diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp index 44c6c588..3f3da98f 100644 --- a/desktop_version/src/Render.cpp +++ b/desktop_version/src/Render.cpp @@ -2455,11 +2455,7 @@ void maprender() graphics.drawfade(); } - if (graphics.resumegamemode) - { - graphics.menuoffrender(); - } - else if (graphics.menuoffset > 0) + if (graphics.resumegamemode || graphics.menuoffset > 0) { graphics.menuoffrender(); } @@ -2595,11 +2591,7 @@ void teleporterrender() } - if (graphics.resumegamemode) - { - graphics.menuoffrender(); - } - else if (graphics.menuoffset > 0) + if (graphics.resumegamemode || graphics.menuoffset > 0) { graphics.menuoffrender(); }