From a22a8728863270f6e791b6c46ae6de1261b7a8d0 Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Tue, 28 Apr 2020 20:28:41 -0700
Subject: [PATCH] Move menu offset logic to maplogic()

This is the logic that handles the timer that brings up and down the
teleporter, pause screen, and Esc screen. So now it doesn't go crazy
fast.
---
 desktop_version/src/Logic.cpp  | 33 ++++++++++++++++++++++++
 desktop_version/src/Render.cpp | 46 ----------------------------------
 2 files changed, 33 insertions(+), 46 deletions(-)

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