From 89b6b67a775091b20df2ff106708d947ff037403 Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Wed, 8 Apr 2020 22:13:43 -0700
Subject: [PATCH] Don't use separate variable for number of crewmates in level

Same as previous commit, this time for crewmates.
---
 desktop_version/src/Game.cpp   | 20 ++++++++++----------
 desktop_version/src/Render.cpp | 16 ++++++++--------
 desktop_version/src/editor.cpp | 23 ++++++++++++++---------
 desktop_version/src/editor.h   |  2 +-
 4 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index 220b67fe..30277864 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -2011,17 +2011,17 @@ void Game::updatestate()
                 graphics.addline("You have found a lost crewmate!");
                 graphics.textboxcenterx();
 
-                if(ed.numcrewmates-crewmates()==0)
+                if(ed.numcrewmates()-crewmates()==0)
                 {
                     graphics.createtextbox("     All crewmates rescued!    ", 50, 65, 174, 174, 174);
                 }
-                else if(ed.numcrewmates-crewmates()==1)
+                else if(ed.numcrewmates()-crewmates()==1)
                 {
-                    graphics.createtextbox("    " + help.number(ed.numcrewmates-crewmates())+ " remains    ", 50, 65, 174, 174, 174);
+                    graphics.createtextbox("    " + help.number(ed.numcrewmates()-crewmates())+ " remains    ", 50, 65, 174, 174, 174);
                 }
                 else
                 {
-                    graphics.createtextbox("     " + help.number(ed.numcrewmates-crewmates())+ " remain    ", 50, 65, 174, 174, 174);
+                    graphics.createtextbox("     " + help.number(ed.numcrewmates()-crewmates())+ " remain    ", 50, 65, 174, 174, 174);
                 }
                 graphics.textboxcenterx();
 
@@ -2033,17 +2033,17 @@ void Game::updatestate()
                 graphics.addline("You have found a lost crewmate!");
                 graphics.textboxcenterx();
 
-                if(ed.numcrewmates-crewmates()==0)
+                if(ed.numcrewmates()-crewmates()==0)
                 {
                     graphics.createtextbox("     All crewmates rescued!    ", 50, 135, 174, 174, 174);
                 }
-                else if(ed.numcrewmates-crewmates()==1)
+                else if(ed.numcrewmates()-crewmates()==1)
                 {
-                    graphics.createtextbox("    " + help.number(ed.numcrewmates-crewmates())+ " remains    ", 50, 135, 174, 174, 174);
+                    graphics.createtextbox("    " + help.number(ed.numcrewmates()-crewmates())+ " remains    ", 50, 135, 174, 174, 174);
                 }
                 else
                 {
-                    graphics.createtextbox("     " + help.number(ed.numcrewmates-crewmates())+ " remain    ", 50, 135, 174, 174, 174);
+                    graphics.createtextbox("     " + help.number(ed.numcrewmates()-crewmates())+ " remain    ", 50, 135, 174, 174, 174);
                 }
                 graphics.textboxcenterx();
             }
@@ -2055,7 +2055,7 @@ void Game::updatestate()
             completestop = false;
             state = 0;
 
-            if(ed.numcrewmates-crewmates()==0)
+            if(ed.numcrewmates()-crewmates()==0)
             {
                 if(map.custommodeforreal)
                 {
@@ -2092,7 +2092,7 @@ void Game::updatestate()
             map.tdrawback = true;
 #if !defined(NO_CUSTOM_LEVELS)
             //Update level stats
-            if(ed.numcrewmates-crewmates()==0)
+            if(ed.numcrewmates()-crewmates()==0)
             {
                 //Finished level
                 if(ed.numtrinkets()-trinkets()==0)
diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp
index 86f932de..2cfa2df3 100644
--- a/desktop_version/src/Render.cpp
+++ b/desktop_version/src/Render.cpp
@@ -2138,10 +2138,10 @@ void maprender()
                 graphics.Print( -1, 220-110, ed.ListOfMetaData[game.playcustomlevel].Desc2, 196, 196, 255 - help.glow, true);
                 graphics.Print( -1, 220-120, ed.ListOfMetaData[game.playcustomlevel].Desc3, 196, 196, 255 - help.glow, true);
 
-                if(ed.numcrewmates-game.crewmates()==1){
-                    graphics.Print(1,220-165, help.number(ed.numcrewmates-game.crewmates())+ " crewmate remains", 196, 196, 255 - help.glow, true);
-                }else if(ed.numcrewmates-game.crewmates()>0){
-                    graphics.Print(1,220-165, help.number(ed.numcrewmates-game.crewmates())+ " crewmates remain", 196, 196, 255 - help.glow, true);
+                if(ed.numcrewmates()-game.crewmates()==1){
+                    graphics.Print(1,220-165, help.number(ed.numcrewmates()-game.crewmates())+ " crewmate remains", 196, 196, 255 - help.glow, true);
+                }else if(ed.numcrewmates()-game.crewmates()>0){
+                    graphics.Print(1,220-165, help.number(ed.numcrewmates()-game.crewmates())+ " crewmates remain", 196, 196, 255 - help.glow, true);
                 }
             }
             else
@@ -2153,10 +2153,10 @@ void maprender()
                 graphics.Print( -1, 110, ed.ListOfMetaData[game.playcustomlevel].Desc2, 196, 196, 255 - help.glow, true);
                 graphics.Print( -1, 120, ed.ListOfMetaData[game.playcustomlevel].Desc3, 196, 196, 255 - help.glow, true);
 
-                if(ed.numcrewmates-game.crewmates()==1){
-                    graphics.Print(1,165, help.number(ed.numcrewmates-game.crewmates())+ " crewmate remains", 196, 196, 255 - help.glow, true);
-                }else if(ed.numcrewmates-game.crewmates()>0){
-                    graphics.Print(1,165, help.number(ed.numcrewmates-game.crewmates())+ " crewmates remain", 196, 196, 255 - help.glow, true);
+                if(ed.numcrewmates()-game.crewmates()==1){
+                    graphics.Print(1,165, help.number(ed.numcrewmates()-game.crewmates())+ " crewmate remains", 196, 196, 255 - help.glow, true);
+                }else if(ed.numcrewmates()-game.crewmates()>0){
+                    graphics.Print(1,165, help.number(ed.numcrewmates()-game.crewmates())+ " crewmates remain", 196, 196, 255 - help.glow, true);
                 }
             }
         }
diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp
index 6ebe2756..37fe021a 100644
--- a/desktop_version/src/editor.cpp
+++ b/desktop_version/src/editor.cpp
@@ -285,7 +285,6 @@ void editorclass::reset()
     entframe=0;
     entframedelay=0;
 
-    numcrewmates=0;
     edentity.clear();
     levmusic=0;
 
@@ -1621,11 +1620,6 @@ int editorclass::findwarptoken(int t)
 
 void editorclass::countstuff()
 {
-    numcrewmates=0;
-    for(size_t i=0; i<edentity.size(); i++)
-    {
-        if(edentity[i].t==15) numcrewmates++;
-    }
 }
 
 void editorclass::load(std::string& _path)
@@ -4920,11 +4914,10 @@ void editorinput()
                             }
                             else if(ed.drawmode==15)  //Crewmate
                             {
-                                if(ed.numcrewmates<100)
+                                if(ed.numcrewmates()<100)
                                 {
                                     addedentity(ed.tilex+ (ed.levx*40),ed.tiley+ (ed.levy*30),15,1 + int(fRandom() * 5));
                                     ed.lclickdelay=1;
-                                    ed.numcrewmates++;
                                 }
                                 else
                                 {
@@ -5047,7 +5040,6 @@ void editorinput()
                     {
                         if(edentity[i].x==ed.tilex + (ed.levx*40)&& edentity[i].y==ed.tiley+ (ed.levy*30))
                         {
-                            if(edentity[i].t==15) ed.numcrewmates--;
                             removeedentity(i);
                         }
                     }
@@ -5214,4 +5206,17 @@ int editorclass::numtrinkets()
     return temp;
 }
 
+int editorclass::numcrewmates()
+{
+    int temp = 0;
+    for (size_t i = 0; i < edentity.size(); i++)
+    {
+        if (edentity[i].t == 15)
+        {
+            temp++;
+        }
+    }
+    return temp;
+}
+
 #endif /* NO_CUSTOM_LEVELS */
diff --git a/desktop_version/src/editor.h b/desktop_version/src/editor.h
index e513cd2b..9bfc5bc3 100644
--- a/desktop_version/src/editor.h
+++ b/desktop_version/src/editor.h
@@ -152,7 +152,7 @@ class editorclass{
   std::vector <int> contents;
   std::vector <int> vmult;
   int numtrinkets();
-  int numcrewmates;
+  int numcrewmates();
   edlevelclass level[400]; //Maxwidth*maxheight
   int kludgewarpdir[400]; //Also maxwidth*maxheight