From 88a5a95cde6494d5a2926c9a25fe87623fb86721 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sat, 6 Nov 2021 10:27:16 +0100
Subject: [PATCH] - SpriteNum cleanup.

---
 source/games/sw/src/miscactr.cpp | 14 --------------
 source/games/sw/src/ripper.cpp   |  2 --
 source/games/sw/src/sector.cpp   |  1 -
 source/games/sw/src/sprite.h     |  1 -
 source/games/sw/src/sumo.cpp     |  1 -
 5 files changed, 19 deletions(-)

diff --git a/source/games/sw/src/miscactr.cpp b/source/games/sw/src/miscactr.cpp
index 7d7122030..a6966748f 100644
--- a/source/games/sw/src/miscactr.cpp
+++ b/source/games/sw/src/miscactr.cpp
@@ -599,8 +599,6 @@ int DoTrashCan(DSWActor* actor)
     USER* u = actor->u();
     SPRITEp sp = &actor->s();
 
-    //(*u->ActorActionFunc) (SpriteNum);
-
     // stay on floor unless doing certain things
     if (TEST(u->Flags,SPR_SLIDING))
         DoActorSlide(actor);
@@ -1290,9 +1288,6 @@ int DoCarGirl(DSWActor* actor)
         }
     }
 
-    //(*u->ActorActionFunc) (SpriteNum);
-
-
     // stay on floor unless doing certain things
     if (!TEST(u->Flags, SPR_JUMPING | SPR_FALLING | SPR_CLIMBING))
     {
@@ -1508,9 +1503,6 @@ int DoMechanicGirl(DSWActor* actor)
         }
     }
 
-    //(*u->ActorActionFunc) (SpriteNum);
-
-
     // stay on floor unless doing certain things
     if (!TEST(u->Flags, SPR_JUMPING | SPR_FALLING | SPR_CLIMBING))
     {
@@ -1731,9 +1723,6 @@ int DoSailorGirl(DSWActor* actor)
         }
     }
 
-    //(*u->ActorActionFunc) (SpriteNum);
-
-
     // stay on floor unless doing certain things
     if (!TEST(u->Flags, SPR_JUMPING | SPR_FALLING | SPR_CLIMBING))
     {
@@ -1954,9 +1943,6 @@ int DoPruneGirl(DSWActor* actor)
         }
     }
 
-    //(*u->ActorActionFunc) (SpriteNum);
-
-
     // stay on floor unless doing certain things
     if (!TEST(u->Flags, SPR_JUMPING | SPR_FALLING | SPR_CLIMBING))
     {
diff --git a/source/games/sw/src/ripper.cpp b/source/games/sw/src/ripper.cpp
index 4ca5c749c..d33cda300 100644
--- a/source/games/sw/src/ripper.cpp
+++ b/source/games/sw/src/ripper.cpp
@@ -1184,7 +1184,6 @@ int DoRipperPain(DSWActor* actor)
 
 
 // CTW MODIFICATION
-//int DoRipperRipHeart(SpriteNum)
 int DoRipperRipHeart(DSWActor* actor)
 // CTW MODIFICATION END
 {
@@ -1202,7 +1201,6 @@ int DoRipperRipHeart(DSWActor* actor)
 }
 
 
-//int DoRipperStandHeart(SpriteNum)
 int DoRipperStandHeart(DSWActor* actor)
 {
     USER* u = actor->u();
diff --git a/source/games/sw/src/sector.cpp b/source/games/sw/src/sector.cpp
index a1a8b6145..d53070d10 100644
--- a/source/games/sw/src/sector.cpp
+++ b/source/games/sw/src/sector.cpp
@@ -917,7 +917,6 @@ void SectorExp(DSWActor* actor, short sectnum, short orig_ang, int zh)
 
     // setup vars needed by SectorExp
     ChangeActorSect(actor, sectnum);
-    //setspritez(SpriteNum, &sp->pos);
     getzsofslope(sp->sectnum, sp->x, sp->y, &u->hiz, &u->loz);
 
     // spawn explosion
diff --git a/source/games/sw/src/sprite.h b/source/games/sw/src/sprite.h
index c9eac27a2..a9419622b 100644
--- a/source/games/sw/src/sprite.h
+++ b/source/games/sw/src/sprite.h
@@ -30,7 +30,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 BEGIN_SW_NS
 
-void KillSprite(int16_t SpriteNum);
 void KillActor(DSWActor* actor);
 DSWActor* SpawnActor(short stat, short id, STATEp state, short sectnum, int x, int y, int z, int ang, int vel);
 void SpriteSetup(void);
diff --git a/source/games/sw/src/sumo.cpp b/source/games/sw/src/sumo.cpp
index 24521f357..71d91ca69 100644
--- a/source/games/sw/src/sumo.cpp
+++ b/source/games/sw/src/sumo.cpp
@@ -740,7 +740,6 @@ int InitSumoFart(DSWActor* actor)
 int InitSumoStomp(DSWActor* actor)
 {
     USER* u = actor->u();
-    int SpriteNum = u->SpriteNum;
     SPRITEp sp = &actor->s();
 
     PlaySound(DIGI_SUMOSTOMP, actor, v3df_none);