diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp index 9ece511d..5f2683f6 100644 --- a/desktop_version/src/Logic.cpp +++ b/desktop_version/src/Logic.cpp @@ -39,6 +39,39 @@ void maplogic() //Misc help.updateglow(); graphics.updatetextboxes(); + + if (graphics.resumegamemode) + { + graphics.menuoffset += 25; + if (map.extrarow) + { + 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; + } + } + } + else if (graphics.menuoffset > 0) + { + graphics.menuoffset -= 25; + if (graphics.menuoffset < 0) + { + graphics.menuoffset = 0; + } + } } diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp index 19241e28..44c6c588 100644 --- a/desktop_version/src/Render.cpp +++ b/desktop_version/src/Render.cpp @@ -2457,33 +2457,10 @@ void maprender() if (graphics.resumegamemode) { - graphics.menuoffset += 25; - if (map.extrarow) - { - 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.menuoffrender(); } else if (graphics.menuoffset > 0) { - graphics.menuoffset -= 25; - if (graphics.menuoffset < 0) graphics.menuoffset = 0; graphics.menuoffrender(); } else @@ -2620,33 +2597,10 @@ void teleporterrender() if (graphics.resumegamemode) { - graphics.menuoffset += 25; - if (map.extrarow) - { - 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.menuoffrender(); } else if (graphics.menuoffset > 0) { - graphics.menuoffset -= 25; - if (graphics.menuoffset < 0) graphics.menuoffset = 0; graphics.menuoffrender(); } else