From 45be386f7fe1788c11a6f89400b1c13bf2f12bb2 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Sat, 25 Mar 2023 20:00:53 +1100
Subject: [PATCH] - Exhumed: Move `nTemperature[]` into `Player` struct.

---
 source/games/exhumed/src/aistuff.h  |  1 -
 source/games/exhumed/src/gun.cpp    | 14 +++++---------
 source/games/exhumed/src/player.cpp |  3 +--
 source/games/exhumed/src/player.h   |  1 +
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/source/games/exhumed/src/aistuff.h b/source/games/exhumed/src/aistuff.h
index 51cc8447c..a6ee07cd0 100644
--- a/source/games/exhumed/src/aistuff.h
+++ b/source/games/exhumed/src/aistuff.h
@@ -128,7 +128,6 @@ struct Weapon
 };
 
 extern Weapon WeaponInfo[];
-extern int16_t nTemperature[];
 
 void RestoreMinAmmo(int nPlayer);
 void FillWeapons(int nPlayer);
diff --git a/source/games/exhumed/src/gun.cpp b/source/games/exhumed/src/gun.cpp
index 2a38c40df..d4525d505 100644
--- a/source/games/exhumed/src/gun.cpp
+++ b/source/games/exhumed/src/gun.cpp
@@ -45,7 +45,6 @@ Weapon WeaponInfo[] = {
     { kSeqDeadBrn, { 1, 0, 0,  0,  0,  0,  0, 0, 0, 0, 0, 0 },  0, 1, 0, false }
 };
 
-int16_t nTemperature[kMaxPlayers];
 static const uint8_t nMinAmmo[] = { 0, 24, 51, 50, 1, 0, 0 };
 int isRed = 0;
 
@@ -60,10 +59,7 @@ void SerializeGun(FSerializer& arc)
 {
     if (arc.BeginObject("gun"))
     {
-        arc.Array("temperature", nTemperature, kMaxPlayers)
-            ("isred", isRed)
-            .EndObject();
-
+        arc("isred", isRed).EndObject();
     }
 }
 
@@ -360,7 +356,7 @@ void MoveWeapons(int nPlayer)
         nPilotLightFrame = 0;
 
     if (!PlayerList[nPlayer].bIsFiring || (nSectFlag & kSectUnderwater))
-        nTemperature[nPlayer] = 0;
+        PlayerList[nPlayer].nTemperature = 0;
 
     auto pPlayerActor = PlayerList[nPlayer].pActor;
     int nWeapon = PlayerList[nPlayer].nCurrentWeapon;
@@ -678,11 +674,11 @@ loc_flag:
 
             if (nWeapon == kWeaponFlamer && (!(nSectFlag & kSectUnderwater)))
             {
-                nTemperature[nPlayer]++;
+                PlayerList[nPlayer].nTemperature++;
 
-                if (nTemperature[nPlayer] > 50)
+                if (PlayerList[nPlayer].nTemperature > 50)
                 {
-                    nTemperature[nPlayer] = 0;
+                    PlayerList[nPlayer].nTemperature = 0;
                     PlayerList[nPlayer].nState = 4;
                     PlayerList[nPlayer].nSeqSize2 = 0;
                 }
diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp
index ff20a1360..dbcf07b3e 100644
--- a/source/games/exhumed/src/player.cpp
+++ b/source/games/exhumed/src/player.cpp
@@ -306,6 +306,7 @@ void RestartPlayer(int nPlayer)
     pPlayer->nCurrentItem = -1;
     pPlayer->nDeathType = 0;
     pPlayer->nQuake = 0;
+    pPlayer->nTemperature = 0;
     SetTorch(nPlayer, 0);
 
     if (nNetPlayerCount)
@@ -333,8 +334,6 @@ void RestartPlayer(int nPlayer)
 		pPlayer->nMagic = 0;
 	}
 
-	nTemperature[nPlayer] = 0;
-
 	BuildRa(nPlayer);
 }
 
diff --git a/source/games/exhumed/src/player.h b/source/games/exhumed/src/player.h
index b90429c41..fbca9b38b 100644
--- a/source/games/exhumed/src/player.h
+++ b/source/games/exhumed/src/player.h
@@ -100,6 +100,7 @@ struct Player
     int16_t dVertPan;
     double nQuake;
     uint8_t nPlayer;
+    int16_t nTemperature;
     PlayerSave sPlayerSave;
     int ototalvel;
     int totalvel;