From 7e04908cd49724b5ac91a9933abe6092670b611a Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Tue, 6 Oct 2020 16:15:44 -0700
Subject: [PATCH] Collapse and invert if-statements in entity logic loops

This makes the code easier to read by reducing the amount of indentation
it has.
---
 desktop_version/src/Logic.cpp | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp
index ea294eab..79055fec 100644
--- a/desktop_version/src/Logic.cpp
+++ b/desktop_version/src/Logic.cpp
@@ -888,10 +888,12 @@ void gamelogic()
             {
                 for (int i = obj.entities.size() - 1; i >= 0;  i--)
                 {
-                    if (obj.entities[i].isplatform)
+                    if (!obj.entities[i].isplatform
+                    || SDL_abs(obj.entities[i].vx) >= 0.000001f)
                     {
-                        if(SDL_abs(obj.entities[i].vx) < 0.000001f)
-                        {
+                        continue;
+                    }
+
                             obj.removeblockat(obj.entities[i].xp, obj.entities[i].yp);
 
                             bool entitygone = obj.updateentities(i);                // Behavioral logic
@@ -905,8 +907,6 @@ void gamelogic()
                             {
                                 obj.movingplatformfix(i, obj.getscm());
                             }
-                        }
-                    }
                 }
             }
 
@@ -914,10 +914,12 @@ void gamelogic()
             {
                 for (int ie = obj.entities.size() - 1; ie >= 0;  ie--)
                 {
-                    if (obj.entities[ie].isplatform)
+                    if (!obj.entities[ie].isplatform
+                    || SDL_abs(obj.entities[ie].vy) >= 0.000001f)
                     {
-                        if(SDL_abs(obj.entities[ie].vy) < 0.000001f)
-                        {
+                        continue;
+                    }
+
                             obj.removeblockat(obj.entities[ie].xp, obj.entities[ie].yp);
 
                             bool entitygone = obj.updateentities(ie);                // Behavioral logic
@@ -926,8 +928,6 @@ void gamelogic()
                             obj.entitymapcollision(ie);            // Collisions with walls
 
                             obj.hormovingplatformfix(ie);
-                        }
-                    }
                 }
                 //is the player standing on a moving platform?
                 int i = obj.getplayer();
@@ -950,13 +950,15 @@ void gamelogic()
 
             for (int ie = obj.entities.size() - 1; ie >= 0;  ie--)
             {
-                if (!obj.entities[ie].isplatform)
+                if (obj.entities[ie].isplatform)
                 {
+                    continue;
+                }
+
                     bool entitygone = obj.updateentities(ie);          // Behavioral logic
                     if (entitygone) continue;
                     obj.updateentitylogic(ie);       // Basic Physics
                     obj.entitymapcollision(ie);      // Collisions with walls
-                }
             }
 
             obj.entitycollisioncheck();         // Check ent v ent collisions, update states