- deleted some unused global variables, code simplification plus exte…

…nded wall index field in Trap Todo: give fields more meaningful names!
ZDoom · Nov 21, 2021 · 73e3960 · 73e3960
1 parent 1d98470
commit 73e3960
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 27 deletions.
diff --git a/source/games/exhumed/src/exhumed.cpp b/source/games/exhumed/src/exhumed.cpp
@@ -108,41 +108,27 @@ short nAlarmTicks;
 short nButtonColor;
 short nEnergyChan;
 
-
-short bModemPlay = false;
 int lCountDown = 0;
 short nEnergyTowers = 0;
 
 short nCfgNetPlayers = 0;
-FILE *vcrfp = NULL;
 
 int lLocalCodes = 0;
 
 short bCoordinates = false;
 
 int nNetTime = -1;
 
-short nCodeMin = 0;
-short nCodeMax = 0;
-short nCodeIndex = 0;
-
-//short nScreenWidth = 320;
-//short nScreenHeight = 200;
 int flash;
 int totalmoves;
 
 short nCurBodyNum = 0;
 
 short nBodyTotal = 0;
 
-short lastfps;
 short nTotalPlayers = 1;
 // TODO: Rename this (or make it static) so it doesn't conflict with library function
-//short socket = 0;
 
-short nFirstPassword = 0;
-short nFirstPassInfo = 0;
-short nPasswordCount = 0;
 
 short bSnakeCam = false;
 short bRecord = false;

diff --git a/source/games/exhumed/src/exhumed.h b/source/games/exhumed/src/exhumed.h
@@ -130,8 +130,6 @@ extern short nButtonColor;
 
 extern short nHeadStage;
 
-extern short lastfps;
-
 extern int flash;
 
 extern short nSnakeCam;

diff --git a/source/games/exhumed/src/init.cpp b/source/games/exhumed/src/init.cpp
@@ -174,7 +174,6 @@ void InitLevel(MapRecord* map)
         InitPlayerKeys(i);
     }
     EndLevel = 0;
-    lastfps = 0;
     ResetView();
     ResetEngine();
     totalmoves = 0;

diff --git a/source/games/exhumed/src/object.cpp b/source/games/exhumed/src/object.cpp
@@ -154,7 +154,7 @@ struct Trap
 
     short field_0;
     short nType;
-    short field_6;
+    int field_6;
     int field_8; // wallnum
     short field_A;
     short field_C;
@@ -2612,15 +2612,8 @@ void PostProcess()
 
                     if (i != j && SectSpeed[j] && !(SectFlag[i] & kSectLava))
                     {
-                        int xVal = wall[sector[i].wallptr].x - wall[sector[j].wallptr].x;
-                        if (xVal < 0) {
-                            xVal = -xVal;
-                        }
-
-                        int yVal = wall[sector[i].wallptr].x - wall[sector[j].wallptr].x;
-                        if (yVal < 0) {
-                            yVal = -yVal;
-                        }
+						int xVal = abs(sector[i].firstWall()->x - sector[j].firstWall()->x);
+						int yVal = abs(sector[i].firstWall()->y - sector[j].firstWall()->y);
 
                         if (xVal < 15000 && yVal < 15000 && (xVal + yVal < var_20))
                         {