From 269f2580b90ae1ac71f2e38e0f438c80f97cdc36 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Tue, 16 Nov 2021 18:58:43 +0100
Subject: [PATCH] - obsolete prototypes in Exhumed

---
 source/games/exhumed/src/aistuff.h    |  4 +---
 source/games/exhumed/src/anims.cpp    |  1 -
 source/games/exhumed/src/roach.cpp    | 12 ------------
 source/games/exhumed/src/sequence.cpp |  4 ++--
 source/games/exhumed/src/sequence.h   |  4 ++--
 source/games/sw/src/draw.cpp          |  4 ++--
 6 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/source/games/exhumed/src/aistuff.h b/source/games/exhumed/src/aistuff.h
index 74ee5d4d4..474059131 100644
--- a/source/games/exhumed/src/aistuff.h
+++ b/source/games/exhumed/src/aistuff.h
@@ -333,9 +333,7 @@ void FuncRa(int, int, int, int);
 // rat
 
 void InitRats();
-void SetRatVel(short nSprite);
 void BuildRat(DExhumedActor* nSprite, int x, int y, int z, int nSector, int nAngle);
-int FindFood(short nSprite);
 void FuncRat(int a, int, int b, int nRun);
 
 // rex
@@ -698,7 +696,7 @@ void runlist_DoSubRunRec(int RunPtr);
 void runlist_SubRunRec(int RunPtr);
 void runlist_ProcessWallTag(int nWall, short nLotag, short nHitag);
 int runlist_CheckRadialDamage(DExhumedActor* actor);
-void runlist_RadialDamageEnemy(DExhumedActor* nSprite, short nSprite2, short nDamage);
+void runlist_RadialDamageEnemy(DExhumedActor* pActor, short nDamage, short nRadius);
 void runlist_DamageEnemy(DExhumedActor* nSprite, DExhumedActor* nSprite2, short nDamage);
 void runlist_SignalRun(int NxtPtr, int edx, void(ExhumedAI::* func)(RunListEvent*), RunListEvent* ev = nullptr);
 
diff --git a/source/games/exhumed/src/anims.cpp b/source/games/exhumed/src/anims.cpp
index 2dd30a570..e8605e685 100644
--- a/source/games/exhumed/src/anims.cpp
+++ b/source/games/exhumed/src/anims.cpp
@@ -126,7 +126,6 @@ void AIAnim::Tick(RunListEvent* ev)
     auto pActor = ev->pObjActor;
     if (!pActor) return;
 
-    //short nSprite = pActor->nSprite;
     short nIndex2 = pActor->nIndex2;
     auto pSprite = &pActor->s();
 
diff --git a/source/games/exhumed/src/roach.cpp b/source/games/exhumed/src/roach.cpp
index 0c4834d12..290ec8b77 100644
--- a/source/games/exhumed/src/roach.cpp
+++ b/source/games/exhumed/src/roach.cpp
@@ -34,18 +34,6 @@ static actionSeq RoachSeq[] = {
     {42, 1}
 };
 
-struct Roach
-{
-    short nHealth;
-    short nFrame;
-    short nAction;
-    short nSprite;
-    short nTarget;
-    short nRun;
-    short nCount;
-    short nIndex;
-};
-
 // TODO - make nType a bool?
 void BuildRoach(int nType, DExhumedActor* pActor, int x, int y, int z, int nSector, int angle)
 {
diff --git a/source/games/exhumed/src/sequence.cpp b/source/games/exhumed/src/sequence.cpp
index 9d504aa0c..4fdf997c1 100644
--- a/source/games/exhumed/src/sequence.cpp
+++ b/source/games/exhumed/src/sequence.cpp
@@ -469,7 +469,7 @@ int seq_GetSeqPicnum(short nSeq, short edx, short ebx)
     return ChunkPict[c];
 }
 
-int seq_PlotArrowSequence(short nSprite, short nSeq, int nVal)
+int seq_PlotArrowSequence(int nSprite, short nSeq, int nVal)
 {
     tspriteptr_t pTSprite = &mytsprite[nSprite];
     int nAngle = GetMyAngle(nCamerax - pTSprite->x, nCameray - pTSprite->y);
@@ -517,7 +517,7 @@ int seq_PlotArrowSequence(short nSprite, short nSeq, int nVal)
     return ChunkPict[nFrameBase];
 }
 
-int seq_PlotSequence(short nSprite, short edx, short nFrame, short ecx)
+int seq_PlotSequence(int nSprite, short edx, short nFrame, short ecx)
 {
     tspriteptr_t pTSprite = &mytsprite[nSprite];
     int nAngle = GetMyAngle(nCamerax - pTSprite->x, nCameray - pTSprite->y);
diff --git a/source/games/exhumed/src/sequence.h b/source/games/exhumed/src/sequence.h
index 5aa673b89..e6fa3a40a 100644
--- a/source/games/exhumed/src/sequence.h
+++ b/source/games/exhumed/src/sequence.h
@@ -141,8 +141,8 @@ void seq_DrawStatusSequence(short nSequence, uint16_t edx, short ebx);
 
 int seq_DrawGunSequence(int nSeqOffset, short dx, double xOffs, double yOffs, int nShade, int nPal);
 short seq_GetFrameFlag(short val, short nFrame);
-int seq_PlotSequence(short nSprite, short edx, short nFrame, short ecx);
-int seq_PlotArrowSequence(short nSprite, short nSeq, int nVal);
+int seq_PlotSequence(int nSprite, short edx, short nFrame, short ecx);
+int seq_PlotArrowSequence(int nSprite, short nSeq, int nVal);
 void seq_DrawPilotLightSeq(double xOffset, double yOffset);
 
 END_PS_NS
diff --git a/source/games/sw/src/draw.cpp b/source/games/sw/src/draw.cpp
index 73b4bc3e0..e5ee54029 100644
--- a/source/games/sw/src/draw.cpp
+++ b/source/games/sw/src/draw.cpp
@@ -102,8 +102,8 @@ ShadeSprite(tspriteptr_t tsp)
 short
 GetRotation(spritetype* tsprite, int& spritesortcnt, short tSpriteNum, int viewx, int viewy)
 {
-    static short RotTable8[] = {0, 7, 6, 5, 4, 3, 2, 1};
-    static short RotTable5[] = {0, 1, 2, 3, 4, 3, 2, 1};
+    static const uint8_t RotTable8[] = {0, 7, 6, 5, 4, 3, 2, 1};
+    static const uint8_t RotTable5[] = {0, 1, 2, 3, 4, 3, 2, 1};
     short rotation;
 
     tspriteptr_t tsp = &tsprite[tSpriteNum];