From c1b478bf839e8cdedd0a553091bbd3d9ba5f9880 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 30 Nov 2020 00:18:32 +0100
Subject: [PATCH] - Exhumed: Snake and Sequence

# Conflicts:
#	source/exhumed/src/save.cpp
---
 source/exhumed/src/aistuff.h    | 17 +++------
 source/exhumed/src/save.cpp     |  4 +++
 source/exhumed/src/sequence.cpp | 19 ++++++----
 source/exhumed/src/snake.cpp    | 62 ++++++++++++++++-----------------
 4 files changed, 50 insertions(+), 52 deletions(-)

diff --git a/source/exhumed/src/aistuff.h b/source/exhumed/src/aistuff.h
index 56d1420da..50f7cbf5f 100644
--- a/source/exhumed/src/aistuff.h
+++ b/source/exhumed/src/aistuff.h
@@ -456,23 +456,14 @@ struct Snake
     short sC;
     short nRun;
 
-    // array?
     char c[8];
-    /*
-    char c1;
-    char c2;
-    char c3;
-    char c4;
-    char c5;
-    char c6;
-    char c7;
-    char c8;
-    */
-
     short sE;
+    short nSnakePlayer;
 };
 
-extern Snake SnakeList[];
+enum { kMaxSnakes = 50 };
+
+extern FreeListArray<Snake, kMaxSnakes> SnakeList;
 
 void InitSnakes();
 short GrabSnake();
diff --git a/source/exhumed/src/save.cpp b/source/exhumed/src/save.cpp
index beea0175f..af70e7351 100644
--- a/source/exhumed/src/save.cpp
+++ b/source/exhumed/src/save.cpp
@@ -29,6 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 BEGIN_PS_NS
 
+void SerializeSequence(FSerializer& arc);
+void SerializeSnake(FSerializer& arc);
 void SerializeSwitch(FSerializer& arc);
 void SerializeView(FSerializer& arc);
 
@@ -61,6 +63,8 @@ void GameInterface::SerializeGameState(FSerializer& arc)
 {
     if (arc.BeginObject("exhumed"))
     {
+    SerializeSequence(arc);
+    SerializeSnake(arc);
     SerializeSwitch(arc);
     SerializeView(arc);
 
diff --git a/source/exhumed/src/sequence.cpp b/source/exhumed/src/sequence.cpp
index 86227eb86..e67b5b76f 100644
--- a/source/exhumed/src/sequence.cpp
+++ b/source/exhumed/src/sequence.cpp
@@ -635,12 +635,17 @@ int seq_PlotSequence(short nSprite, short edx, short nFrame, short ecx)
     return nPict;
 }
 
-static SavegameHelper sghseq("sequence",
-    SV(nPilotLightFrame),
-    SV(nPilotLightCount),
-    SV(nPilotLightBase),
-    SV(nShadowWidth),
-    SV(nFlameHeight),
-    nullptr);
+void SerializeSequence(FSerializer& arc)
+{
+    if (arc.BeginObject("sequence"))
+    {
+        arc("pilotlightframe", nPilotLightFrame)
+            ("pilotlightcount", nPilotLightCount)
+            ("pilotlightbase", nPilotLightBase)
+            ("shadowwidth", nShadowWidth)
+            ("flameheight", nFlameHeight)
+            .EndObject();
+    }
+}
 
 END_PS_NS
diff --git a/source/exhumed/src/snake.cpp b/source/exhumed/src/snake.cpp
index 986029f80..62d16e16c 100644
--- a/source/exhumed/src/snake.cpp
+++ b/source/exhumed/src/snake.cpp
@@ -29,42 +29,42 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 BEGIN_PS_NS
 
-enum { kMaxSnakes	= 50 };
+FreeListArray<Snake, kMaxSnakes> SnakeList;
 
-int nSnakeCount = 0;
-int nSnakesFree;
-
-short SnakeFree[kMaxSnakes];
 short nPlayerSnake[kMaxPlayers];
 
-Snake SnakeList[kMaxSnakes];
-short nSnakePlayer[kMaxSnakes];
+FSerializer& Serialize(FSerializer& arc, const char* keyname, Snake& w, Snake* def)
+{
+    if (arc.BeginObject(keyname))
+    {
+        arc("enemy", w.nEnemy)
+            .Array("sprites", w.nSprites, kSnakeSprites)
+            ("sc", w.sC)
+            ("run", w.nRun)
+            .Array("c", w.c, countof(w.c))
+            ("se", w.sE)
+            ("player", w.nSnakePlayer)
+            .EndObject();
+    }
+    return arc;
+}
+
+void SerializeSnake(FSerializer& arc)
+{
+    arc("snake", SnakeList);
+    arc.Array("playersnake", nPlayerSnake, PlayerCount);
+}
 
-static SavegameHelper sghsnake("snake",
-    SV(nSnakeCount),
-    SV(nSnakesFree),
-    SA(SnakeFree),
-    SA(nPlayerSnake),
-    SA(SnakeList),
-    SA(nSnakePlayer),
-    nullptr);
 
 void InitSnakes()
 {
-    nSnakeCount = 0;
-
-    for (int i = 0; i < kMaxSnakes; i++) {
-        SnakeFree[i] = i;
-    }
-
-    nSnakesFree = kMaxSnakes;
+    SnakeList.Clear();
     memset(nPlayerSnake, 0, sizeof(nPlayerSnake));
 }
 
 short GrabSnake()
 {
-    nSnakesFree--;
-    return SnakeFree[nSnakesFree];
+    return SnakeList.Get();
 }
 
 void DestroySnake(int nSnake)
@@ -82,8 +82,7 @@ void DestroySnake(int nSnake)
         mydeletesprite(nSprite);
     }
 
-    SnakeFree[nSnakesFree] = nSnake;
-    nSnakesFree++;
+    SnakeList.Release(nSnake);
 
     if (nSnake == nSnakeCam)
     {
@@ -116,8 +115,6 @@ void ExplodeSnakeSprite(int nSprite, short nPlayer)
 
 int BuildSnake(short nPlayer, short zVal)
 {
-    if (!nSnakesFree)
-        return -1;
 
     zVal -= 1280;
 
@@ -182,6 +179,7 @@ int BuildSnake(short nPlayer, short zVal)
         }
 
         short nSnake = GrabSnake();
+        if (nSnake == -1) return -1;
 
 //		GrabTimeSlot(3);
 
@@ -244,7 +242,7 @@ int BuildSnake(short nPlayer, short zVal)
         SnakeList[nSnake].nEnemy = nTarget;
         SnakeList[nSnake].sC = 1200;
         SnakeList[nSnake].sE = 0;
-        nSnakePlayer[nSnake] = nPlayer;
+        SnakeList[nSnake].nSnakePlayer = nPlayer;
         nPlayerSnake[nPlayer] = nSnake;
 
         if (bSnakeCam)
@@ -262,7 +260,7 @@ int BuildSnake(short nPlayer, short zVal)
 
 int FindSnakeEnemy(short nSnake)
 {
-    short nPlayer = nSnakePlayer[nSnake];
+    short nPlayer = SnakeList[nSnake].nSnakePlayer;
     short nPlayerSprite = PlayerList[nPlayer].nSprite;
 
     short nSprite = SnakeList[nSnake].nSprites[0]; // CHECKME
@@ -359,11 +357,11 @@ SEARCH_ENEMY:
 
             if (nMov)
             {
-                short nPlayer = nSnakePlayer[nSnake];
+                short nPlayer = SnakeList[nSnake].nSnakePlayer;
                 ExplodeSnakeSprite(SnakeList[nSnake].nSprites[0], nPlayer);
 
                 nPlayerSnake[nPlayer] = -1;
-                nSnakePlayer[nSnake] = -1;
+                SnakeList[nSnake].nSnakePlayer = -1;
 
                 DestroySnake(nSnake);
             }