From 07f61e061e1a19d80c8d17311b77cd9fff74de74 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Tue, 2 Nov 2021 21:45:47 +0100
Subject: [PATCH] - serp.cpp

---
 source/games/sw/src/serp.cpp   | 17 ++++++-----------
 source/games/sw/src/sprite.cpp |  4 ++--
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/source/games/sw/src/serp.cpp b/source/games/sw/src/serp.cpp
index 9eb021008..56604bcab 100644
--- a/source/games/sw/src/serp.cpp
+++ b/source/games/sw/src/serp.cpp
@@ -695,22 +695,20 @@ ACTOR_ACTION_SET SerpActionSet =
     nullptr
 };
 
-int
-SetupSerp(short SpriteNum)
+int SetupSerp(DSWActor* actor)
 {
-    auto actor = &swActors[SpriteNum];
-    SPRITEp sp = &sprite[SpriteNum];
+    SPRITEp sp = &actor->s();
     USERp u;
     ANIMATOR DoActorDecide;
 
     if (TEST(sp->cstat, CSTAT_SPRITE_RESTORE))
     {
-        u = User[SpriteNum].Data();
+        u = actor->u();
         ASSERT(u);
     }
     else
     {
-        u = SpawnUser(SpriteNum,SERP_RUN_R0,s_SerpRun[0]);
+        u = SpawnUser(actor,SERP_RUN_R0,s_SerpRun[0]);
         u->Health = HEALTH_SERP_GOD;
     }
 
@@ -757,7 +755,6 @@ SetupSerp(short SpriteNum)
 int NullSerp(DSWActor* actor)
 {
     USER* u = actor->u();
-    int SpriteNum = u->SpriteNum;
 
     if (TEST(u->Flags,SPR_SLIDING))
         DoActorSlide(actor);
@@ -771,8 +768,7 @@ int NullSerp(DSWActor* actor)
 int DoSerpMove(DSWActor* actor)
 {
     USER* u = actor->u();
-    int SpriteNum = u->SpriteNum;
-    SPRITEp sp = &sprite[SpriteNum];
+    SPRITEp sp = &actor->s();
 
     if (TEST(u->Flags,SPR_SLIDING))
         DoActorSlide(actor);
@@ -814,8 +810,7 @@ int DoSerpMove(DSWActor* actor)
 int DoDeathSpecial(DSWActor* actor)
 {
     USER* u = actor->u();
-    int SpriteNum = u->SpriteNum;
-    SPRITEp sp = &sprite[SpriteNum];
+    SPRITEp sp = &actor->s();
 
     DoMatchEverything(nullptr, sp->lotag, ON);
 
diff --git a/source/games/sw/src/sprite.cpp b/source/games/sw/src/sprite.cpp
index 532e8e8c7..bf8b785f3 100644
--- a/source/games/sw/src/sprite.cpp
+++ b/source/games/sw/src/sprite.cpp
@@ -70,7 +70,7 @@ int SetupTrashCan(DSWActor*);
 int SetupBunny(DSWActor*);
 int SetupRipper(DSWActor*);
 int SetupRipper2(DSWActor*);
-int SetupSerp(short);
+int SetupSerp(DSWActor*);
 int SetupLava(DSWActor* actor);
 int SetupSkel(short);
 int SetupHornet(DSWActor*);
@@ -1459,7 +1459,7 @@ ActorSpawn(SPRITEp sp)
         }
 
         PicAnimOff(sp->picnum);
-        SetupSerp(SpriteNum);
+        SetupSerp(actor);
         break;
     }