From ca6724a3f5cec420ae181b4b7c0e165c9555d595 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Thu, 21 Oct 2021 10:41:41 +0200
Subject: [PATCH] - make nNetStartSprite an actor array.

---
 source/games/exhumed/src/init.cpp   | 8 ++++----
 source/games/exhumed/src/player.cpp | 8 ++++----
 source/games/exhumed/src/player.h   | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/source/games/exhumed/src/init.cpp b/source/games/exhumed/src/init.cpp
index a7d9c9c08..4b90e338d 100644
--- a/source/games/exhumed/src/init.cpp
+++ b/source/games/exhumed/src/init.cpp
@@ -768,7 +768,7 @@ void ProcessSpriteTag(short nSprite, short nLotag, short nHitag)
             }
             case 62:
             {
-                nNetStartSprite[nNetStartSprites] = nSprite;
+                nNetStartSprite[nNetStartSprites] = pActor;
                 pSprite->cstat = 0x8000;
 
                 nNetStartSprites++;
@@ -823,14 +823,14 @@ void ExamineSprites()
 
     if (nNetPlayerCount)
     {
-        int nSprite = insertsprite(initsect, 0);
-		auto pSprite = &sprite[nSprite];
+        auto pActor = insertActor(initsect, 0);
+		auto pSprite = &pActor->s();
 
         pSprite->x = initx;
         pSprite->y = inity;
         pSprite->z = initz;
         pSprite->cstat = 0x8000;
-        nNetStartSprite[nNetStartSprites] = nSprite;
+        nNetStartSprite[nNetStartSprites] = pActor;
         nNetStartSprites++;
     }
 }
diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp
index 19b8b80f3..ee5365036 100644
--- a/source/games/exhumed/src/player.cpp
+++ b/source/games/exhumed/src/player.cpp
@@ -109,7 +109,7 @@ PlayerSave sPlayerSave[kMaxPlayers];
 int ototalvel[kMaxPlayers] = { 0 };
 int totalvel[kMaxPlayers] = { 0 };
 int16_t eyelevel[kMaxPlayers], oeyelevel[kMaxPlayers];
-short nNetStartSprite[kMaxPlayers] = { 0 };
+DExhumedActor* nNetStartSprite[kMaxPlayers] = { };
 
 short nStandHeight;
 
@@ -295,8 +295,8 @@ void RestartPlayer(short nPlayer)
 
 	if (nTotalPlayers > 1)
 	{
-		int nNStartSprite = nNetStartSprite[nCurStartSprite];
-		auto nstspr = &sprite[nNStartSprite];
+		auto nNStartSprite = nNetStartSprite[nCurStartSprite];
+		auto nstspr = &nNStartSprite->s();
 		nCurStartSprite++;
 
 		if (nCurStartSprite >= nNetStartSprites) {
@@ -2742,7 +2742,7 @@ void SerializePlayer(FSerializer& arc)
             ("playercount", PlayerCount)
             ("netstartsprites", nNetStartSprites)
             ("localplayer", nLocalPlayer)
-            .Array("curstartsprite", nNetStartSprite, PlayerCount)
+            ("curstartsprite", nCurStartSprite)
             .Array("breathtimer", nBreathTimer, PlayerCount)
             .Array("playerswear", nPlayerSwear, PlayerCount)
             .Array("pushsect", nPlayerPushSect, PlayerCount)
diff --git a/source/games/exhumed/src/player.h b/source/games/exhumed/src/player.h
index e81216ff2..e7dceb1ad 100644
--- a/source/games/exhumed/src/player.h
+++ b/source/games/exhumed/src/player.h
@@ -111,7 +111,7 @@ extern short obobangle, bobangle;
 extern int ototalvel[], totalvel[];
 extern int16_t eyelevel[], oeyelevel[];
 
-extern short nNetStartSprite[kMaxPlayers];
+extern DExhumedActor* nNetStartSprite[kMaxPlayers];
 extern short nNetStartSprites;
 extern short nCurStartSprite;