From c7e807541cd38fd397487e7d8ecd43d86006d1d8 Mon Sep 17 00:00:00 2001
From: Misa <infoteddy@infoteddy.info>
Date: Fri, 19 Mar 2021 13:34:13 -0700
Subject: [PATCH] De-duplicate Flip Mode textbox crewmate rendering

The only difference between Flip Mode and normal mode is the y-position
and sprite used to draw the crewmates. Everything else is the same, so
I've removed the copy-pasted portion.

The diff might look a bit ugly due to the unindentation.
---
 desktop_version/src/Graphics.cpp | 79 +++++++++++---------------------
 1 file changed, 27 insertions(+), 52 deletions(-)

diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp
index 6a6ad197..4b8f8d8e 100644
--- a/desktop_version/src/Graphics.cpp
+++ b/desktop_version/src/Graphics.cpp
@@ -814,13 +814,19 @@ void Graphics::drawtowertile3( int x, int y, int t, TowerBG& bg_obj )
 void Graphics::drawgui(void)
 {
     int text_sign;
+    int crew_yp;
+    int crew_sprite;
     if (flipmode)
     {
         text_sign = -1;
+        crew_yp = 64 + 48 + 4;
+        crew_sprite = 6;
     }
     else
     {
         text_sign = 1;
+        crew_yp = 64 + 32 + 4;
+        crew_sprite = 0;
     }
 
     //Draw all the textboxes to the screen
@@ -899,61 +905,30 @@ void Graphics::drawgui(void)
                 drawimage(4, 0, 12, true);
             }
         }
-        if (flipmode)
+        if (textbox[i].r == 175 && textbox[i].g == 175 && drawspecial)
         {
-            if (textbox[i].r == 175 && textbox[i].g == 175 && drawspecial)
-            {
-                //purple guy
-                drawsprite(80 - 6, 64 + 48 + 4, 6, 220- help.glow/4 - int(fRandom()*20), 120- help.glow/4, 210 - help.glow/4);
-            }
-            else if (textbox[i].r == 175 && textbox[i].b == 175 && drawspecial)
-            {
-                //red guy
-                drawsprite(80 - 6, 64 + 48+ 4, 6, 255 - help.glow/8, 70 - help.glow/4, 70 - help.glow / 4);
-            }
-            else if (textbox[i].r == 175 && drawspecial)
-            {
-                //green guy
-                drawsprite(80 - 6, 64 + 48 + 4, 6, 120 - help.glow / 4 - int(fRandom() * 20), 220 - help.glow / 4, 120 - help.glow / 4);
-            }
-            else if (textbox[i].g == 175 && drawspecial)
-            {
-                //yellow guy
-                drawsprite(80 - 6, 64 + 48+ 4, 6, 220- help.glow/4 - int(fRandom()*20), 210 - help.glow/4, 120- help.glow/4);
-            }
-            else if (textbox[i].b == 175 && drawspecial)
-            {
-                //blue guy
-                drawsprite(80 - 6, 64 + 48+ 4, 6, 75, 75, 255- help.glow/4 - int(fRandom()*20));
-            }
+            //purple guy
+            drawsprite(80 - 6, crew_yp, crew_sprite, 220- help.glow/4 - int(fRandom()*20), 120- help.glow/4, 210 - help.glow/4);
         }
-        else
+        else if (textbox[i].r == 175 && textbox[i].b == 175 && drawspecial)
         {
-            if (textbox[i].r == 175 && textbox[i].g == 175 && drawspecial)
-            {
-                //purple guy
-                drawsprite(80 - 6, 64 + 32 + 4, 0, 220- help.glow/4 - int(fRandom()*20), 120- help.glow/4, 210 - help.glow/4);
-            }
-            else if (textbox[i].r == 175 && textbox[i].b == 175 && drawspecial)
-            {
-                //red guy
-                drawsprite(80 - 6, 64 + 32 + 4, 0, 255 - help.glow/8, 70 - help.glow/4, 70 - help.glow / 4);
-            }
-            else if (textbox[i].r == 175 && drawspecial)
-            {
-                //green guy
-                drawsprite(80 - 6, 64 + 32 + 4, 0, 120 - help.glow / 4 - int(fRandom() * 20), 220 - help.glow / 4, 120 - help.glow / 4);
-            }
-            else if (textbox[i].g == 175 && drawspecial)
-            {
-                //yellow guy
-                drawsprite(80 - 6, 64 + 32 + 4, 0, 220- help.glow/4 - int(fRandom()*20), 210 - help.glow/4, 120- help.glow/4);
-            }
-            else if (textbox[i].b == 175 && drawspecial)
-            {
-                //blue guy
-                drawsprite(80 - 6, 64 + 32 + 4, 0, 75, 75, 255- help.glow/4 - int(fRandom()*20));
-            }
+            //red guy
+            drawsprite(80 - 6, crew_yp, crew_sprite, 255 - help.glow/8, 70 - help.glow/4, 70 - help.glow / 4);
+        }
+        else if (textbox[i].r == 175 && drawspecial)
+        {
+            //green guy
+            drawsprite(80 - 6, crew_yp, crew_sprite, 120 - help.glow / 4 - int(fRandom() * 20), 220 - help.glow / 4, 120 - help.glow / 4);
+        }
+        else if (textbox[i].g == 175 && drawspecial)
+        {
+            //yellow guy
+            drawsprite(80 - 6, crew_yp, crew_sprite, 220- help.glow/4 - int(fRandom()*20), 210 - help.glow/4, 120- help.glow/4);
+        }
+        else if (textbox[i].b == 175 && drawspecial)
+        {
+            //blue guy
+            drawsprite(80 - 6, crew_yp, crew_sprite, 75, 75, 255- help.glow/4 - int(fRandom()*20));
         }
     }
 }