- deleted all leftover SPRITEp stuff.

source/games/sw/src/game.h

@@ -418,7 +418,6 @@ typedef pANIMATOR *pANIMATORp;
 typedef void soANIMATOR (SECTOR_OBJECTp);
 typedef soANIMATOR *soANIMATORp;
 
-typedef spritetype SPRITE, *SPRITEp;
 typedef sectortype SECTOR, *SECTORp;
 typedef walltype WALL, *WALLp;
 

source/games/sw/src/light.cpp

@@ -93,8 +93,7 @@ void DiffuseLighting(DSWActor* actor)
     int i;
     short count;
     short shade;
-    SPRITEp dsp;
-
+    
     // diffused lighting
     count = 0;
     SWStatIterator it(STAT_LIGHTING_DIFFUSE);

source/games/sw/src/player.cpp

@@ -1132,7 +1132,6 @@ DSWActor* DoPickTarget(DSWActor* actor, uint32_t max_delta_ang, int skip_targets
 
     short angle2, delta_ang;
     int dist, zh;
-    SPRITEp ep;
     int16_t* shp;
     USERp u = actor->u();
     int ezh, ezhl, ezhm;
@@ -1300,8 +1299,7 @@ void DoSpawnTeleporterEffect(DSWActor* actor)
 {
     extern STATE s_TeleportEffect[];
     int nx, ny;
-    SPRITEp ep;
-
+    
     nx = MOVEx(512, actor->spr.ang);
     ny = MOVEy(512, actor->spr.ang);
 
@@ -1325,8 +1323,7 @@ void DoSpawnTeleporterEffect(DSWActor* actor)
 void DoSpawnTeleporterEffectPlace(DSWActor* actor)
 {
     extern STATE s_TeleportEffect[];
-    SPRITEp ep;
-
+    
     auto effectActor = SpawnActor(STAT_MISSILE, 0, s_TeleportEffect, actor->spr.sector(),
                          actor->spr.pos.X, actor->spr.pos.Y, ActorZOfTop(actor) + Z(16),
                          actor->spr.ang, 0);
@@ -1347,8 +1344,7 @@ void DoPlayerWarpTeleporter(PLAYERp pp)
     USERp u = ppActor->u();
     short pnum;
     DSWActor* act_warp;
-    SPRITEp sp_warp;
-
+    
 #if 0
     TAG 2 = match
             TAG 3 = Type
@@ -5843,7 +5839,6 @@ void DoPlayerHeadDebris(PLAYERp pp)
 void DoPlayerDeathCheckKick(PLAYERp pp)
 {
     DSWActor* plActor = pp->actor;
-    SPRITEp hp;
     unsigned stat;
     int dist;
     int a,b,c;

source/games/sw/src/player.h

@@ -121,7 +121,6 @@ int SetVisHigh(void);
 int SetVisNorm(void);
 void DoWeapon(void);
 void HeadBobStateControl(void);
-int DoPickTarget(SPRITEp sp, uint32_t max_delta_ang, int skip_targets);
 void DoPlayer(void);
 void domovethings(void);
 void InitAllPlayers(void);
@@ -137,7 +136,7 @@ int DoPlayerWadeSuperJump(PLAYERp pp);
 void DoPlayerWarpTeleporter(PLAYERp pp);
 void UpdatePlayerSprite(PLAYERp pp);
 void PlaySOsound(sectortype* sect,short sound_num);
-void DoSpawnTeleporterEffectPlace(SPRITEp sp);
+void DoSpawnTeleporterEffectPlace(DSWActor* sp);
 void FindMainSector(SECTOR_OBJECTp sop);
 
 END_SW_NS

source/games/sw/src/predict.cpp

@@ -71,7 +71,7 @@ void DoPrediction(PLAYERp ppp)
 {
 #if 0
     USERp u;
-    SPRITE spr;
+    spritetype spr;
     int bakrandomseed;
 
     // routine called from MoveLoop

source/games/sw/src/rotator.cpp

@@ -189,8 +189,6 @@ void DoRotatorMatch(PLAYERp pp, short match, bool manual)
 
 bool TestRotatorMatchActive(short match)
 {
-    SPRITEp fsp;
-
     SWStatIterator it(STAT_ROTATOR);
     while (auto actor = it.Next())
     {

source/games/sw/src/sprite.cpp

@@ -3795,7 +3795,6 @@ int ActorCoughItem(DSWActor* actor)
 int SpawnItemsMatch(short match)
 {
     DSWActor* spawnedActor = nullptr;
-    SPRITEp sip;
 
     SWStatIterator it(STAT_SPAWN_ITEMS);
     while (auto itActor = it.Next())
@@ -4461,7 +4460,6 @@ void getzrangepoint(int x, int y, int z, sectortype* sect,
 
 void DoActorZrange(DSWActor* actor)
 {
-    SPRITEp wp;
     Collision ceilhit, florhit;
 
     auto save_cstat = actor->spr.cstat & CSTAT_SPRITE_BLOCK;
@@ -4928,7 +4926,6 @@ int KillGetWeapon(DSWActor* actor)
 int DoSpawnItemTeleporterEffect(DSWActor* actor)
 {
     extern STATE s_TeleportEffect[];
-    SPRITEp ep;
 
     auto effect = SpawnActor(STAT_MISSILE, 0, s_TeleportEffect, actor->spr.sector(),
                          actor->spr.pos.X, actor->spr.pos.Y, actor->spr.pos.Z - Z(12),

source/games/sw/src/track.cpp

@@ -378,7 +378,6 @@ void QuickScanSetup(short stat, short lotag, short type)
     int ndx;
     TRACK_POINTp tp;
     TRACKp t;
-    SPRITEp nsp;
     DSWActor* start_sprite,* end_sprite;
 
     // make short quick jump tracks

source/games/sw/src/zombie.cpp

@@ -771,8 +771,6 @@ int SetupZombie(DSWActor* actor)
 
 void SpawnZombie(PLAYERp pp, DSWActor* weaponActor)
 {
-    SPRITEp np;
-
     auto ownerActor = GetOwner(weaponActor);
 
     if (ownerActor == nullptr)
@@ -802,7 +800,6 @@ void SpawnZombie(PLAYERp pp, DSWActor* weaponActor)
 
 void SpawnZombie2(DSWActor* actor)
 {
-    SPRITEp np;
     auto sectu = actor->spr.sector();
     SECTORp sectp = actor->spr.sector();