From 298aa95259a8fa816cc214381bcbac2563b085b2 Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Tue, 28 Apr 2020 16:25:03 -0700
Subject: [PATCH] Move onground/onroof/animateentities logic to start of
 gamelogic()

For some reason, it was put near the start of gamerender(), even though
since it handles edge-flipping it seems like it should be in the logic
function already.

This makes sure entity animations don't animate as fast as possible, and
also fixes edge-flipping on normal surfaces.
---
 desktop_version/src/Logic.cpp  | 28 ++++++++++++++++++++++++++++
 desktop_version/src/Render.cpp | 28 ----------------------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp
index 161bfe47..31f99972 100644
--- a/desktop_version/src/Logic.cpp
+++ b/desktop_version/src/Logic.cpp
@@ -119,6 +119,34 @@ void gamecompletelogic2()
 
 void gamelogic()
 {
+    if (!game.blackout && !game.completestop)
+    {
+        for (size_t i = 0; i < obj.entities.size(); i++)
+        {
+            //Is this entity on the ground? (needed for jumping)
+            if (obj.entitycollidefloor(i))
+            {
+                obj.entities[i].onground = 2;
+            }
+            else
+            {
+                obj.entities[i].onground--;
+            }
+
+            if (obj.entitycollideroof(i))
+            {
+                obj.entities[i].onroof = 2;
+            }
+            else
+            {
+                obj.entities[i].onroof--;
+            }
+
+            //Animate the entities
+            obj.animateentities(i);
+        }
+    }
+
     //Misc
     if (map.towermode)
     {
diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp
index 0084c39b..22312f00 100644
--- a/desktop_version/src/Render.cpp
+++ b/desktop_version/src/Render.cpp
@@ -1348,34 +1348,6 @@ void gamerender()
         }
 
 
-        if(!game.completestop)
-        {
-            for (size_t i = 0; i < obj.entities.size(); i++)
-            {
-                //Is this entity on the ground? (needed for jumping)
-                if (obj.entitycollidefloor(i))
-                {
-                    obj.entities[i].onground = 2;
-                }
-                else
-                {
-                    obj.entities[i].onground--;
-                }
-
-                if (obj.entitycollideroof(i))
-                {
-                    obj.entities[i].onroof = 2;
-                }
-                else
-                {
-                    obj.entities[i].onroof--;
-                }
-
-                //Animate the entities
-                obj.animateentities(i);
-            }
-        }
-
         graphics.drawentities();
         if (map.towermode)
         {