From 587cd09e8e7b1c2751058b58cbfae34e9c62684f Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Thu, 21 Oct 2021 09:50:00 +0200
Subject: [PATCH] - BuildItemAnim

---
 source/games/exhumed/src/aistuff.h  |  2 +-
 source/games/exhumed/src/init.cpp   | 30 ++++++++++++++---------------
 source/games/exhumed/src/items.cpp  |  6 +++---
 source/games/exhumed/src/player.cpp |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/source/games/exhumed/src/aistuff.h b/source/games/exhumed/src/aistuff.h
index 18db5df00..5c61a1143 100644
--- a/source/games/exhumed/src/aistuff.h
+++ b/source/games/exhumed/src/aistuff.h
@@ -156,7 +156,7 @@ enum
 
 extern short nItemMagic[];
 
-void BuildItemAnim(short nSprite);
+void BuildItemAnim(DExhumedActor* nSprite);
 void DestroyItemAnim(short nSprite);
 void ItemFlash();
 void FillItems(short nPlayer);
diff --git a/source/games/exhumed/src/init.cpp b/source/games/exhumed/src/init.cpp
index 621f2901a..a7d9c9c08 100644
--- a/source/games/exhumed/src/init.cpp
+++ b/source/games/exhumed/src/init.cpp
@@ -395,33 +395,33 @@ void ProcessSpriteTag(short nSprite, short nLotag, short nHitag)
         case 60:
         {
             pSprite->hitag = nVal;
-            changespritestat(nSprite, nLotag + 900);
+            ChangeActorStat(pActor, nLotag + 900);
             pSprite->cstat &= 0xFEFE;
-            BuildItemAnim(nSprite);
+            BuildItemAnim(pActor);
             return;
         }
         case 12: // berry twig
         {
             pSprite->hitag = 40;
-            changespritestat(nSprite, nLotag + 900);
+            ChangeActorStat(pActor, nLotag + 900);
             pSprite->cstat &= 0xFEFE;
-            BuildItemAnim(nSprite);
+            BuildItemAnim(pActor);
             return;
         }
         case 13: // blood bowl
         {
             pSprite->hitag = 160;
-            changespritestat(nSprite, nLotag + 900);
+            ChangeActorStat(pActor, nLotag + 900);
             pSprite->cstat &= 0xFEFE;
-            BuildItemAnim(nSprite);
+            BuildItemAnim(pActor);
             return;
         }
         case 14: // venom bowl
         {
             pSprite->hitag = -200;
-            changespritestat(nSprite, nLotag + 900);
+            ChangeActorStat(pActor, nLotag + 900);
             pSprite->cstat &= 0xFEFE;
-            BuildItemAnim(nSprite);
+            BuildItemAnim(pActor);
             return;
         }
 
@@ -442,18 +442,18 @@ void ProcessSpriteTag(short nSprite, short nLotag, short nHitag)
             else
             {
                 pSprite->hitag = nVal;
-                changespritestat(nSprite, nLotag + 900);
+                ChangeActorStat(pActor, nLotag + 900);
                 pSprite->cstat &= 0xFEFE;
-                BuildItemAnim(nSprite);
+                BuildItemAnim(pActor);
                 return;
             }
         }
         case 27:
         {
             pSprite->hitag = 1;
-            changespritestat(nSprite, 9 + 900);
+            ChangeActorStat(pActor, 9 + 900);
             pSprite->cstat &= 0xFEFE;
-            BuildItemAnim(nSprite);
+            BuildItemAnim(pActor);
             return;
         }
 
@@ -462,9 +462,9 @@ void ProcessSpriteTag(short nSprite, short nLotag, short nHitag)
             nVal++;
             nVal--; // CHECKME ??
             pSprite->hitag = nVal;
-            changespritestat(nSprite, nLotag + 900);
+            ChangeActorStat(pActor, nLotag + 900);
             pSprite->cstat &= 0xFEFE;
-            BuildItemAnim(nSprite);
+            BuildItemAnim(pActor);
             return;
         }
     }
@@ -762,7 +762,7 @@ void ProcessSpriteTag(short nSprite, short nLotag, short nHitag)
             }
             case 63:
             {
-                changespritestat(nSprite, 405);
+                ChangeActorStat(pActor, 405);
                 pSprite->cstat = 0x8000;
                 return;
             }
diff --git a/source/games/exhumed/src/items.cpp b/source/games/exhumed/src/items.cpp
index 0e72e5ad8..3f4c5c19e 100644
--- a/source/games/exhumed/src/items.cpp
+++ b/source/games/exhumed/src/items.cpp
@@ -120,15 +120,15 @@ void SerializeItems(FSerializer& arc)
     }
 }
 
-void BuildItemAnim(short nSprite)
+void BuildItemAnim(DExhumedActor* pActor)
 {
-	auto pSprite = &sprite[nSprite];
+	auto pSprite = &pActor->s();
 
     int nItem = pSprite->statnum - 906;
 
     if (nItemAnimInfo[nItem].a >= 0)
     {
-        auto pAnimActor = BuildAnim(&exhumedActors[nSprite], 41, nItemAnimInfo[nItem].a, pSprite->x, pSprite->y, pSprite->z, pSprite->sectnum, nItemAnimInfo[nItem].repeat, 20);
+        auto pAnimActor = BuildAnim(pActor, 41, nItemAnimInfo[nItem].a, pSprite->x, pSprite->y, pSprite->z, pSprite->sectnum, nItemAnimInfo[nItem].repeat, 20);
 
         if (nItem == 44) {
             pAnimActor->s().cstat |= 2;
diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp
index c20c8f385..cdc8104ed 100644
--- a/source/games/exhumed/src/player.cpp
+++ b/source/games/exhumed/src/player.cpp
@@ -518,7 +518,7 @@ void StartDeathSeq(int nPlayer, int nVal)
 
                 pGunSprite->picnum = nGunPicnum[nWeapon];
 
-                BuildItemAnim(pGunActor->GetSpriteIndex());
+                BuildItemAnim(pGunActor);
             }
         }
     }