- clean up ANIMATOR declarations.

ZDoom · May 28, 2023 · 540f964 · 540f964
1 parent 1b685d8
commit 540f964
Show file tree

Hide file tree

Showing 16 changed files with 2 additions and 131 deletions.
diff --git a/source/games/sw/src/coolie.cpp b/source/games/sw/src/coolie.cpp
@@ -473,8 +473,6 @@ void EnemyDefaults(DSWActor* actor, ACTOR_ACTION_SET* action, PERSONALITY* perso
 
 int SetupCoolie(DSWActor* actor)
 {
-    ANIMATOR DoActorDecide;
-
     if (!(actor->spr.cstat & CSTAT_SPRITE_RESTORE))
     {
         SpawnUser(actor,COOLIE_RUN_R0,s_CoolieRun[0]);

diff --git a/source/games/sw/src/eel.cpp b/source/games/sw/src/eel.cpp
@@ -81,8 +81,6 @@ DECISION EelCloseRange[] =
     {1024,  InitActorReposition            }
 };
 
-ANIMATOR InitEelFire;
-
 DECISION EelTouchTarget[] =
 {
     {1024,  InitActorAttack            },
@@ -379,8 +377,6 @@ void EelCommon(DSWActor* actor)
 
 int SetupEel(DSWActor* actor)
 {
-    ANIMATOR DoActorDecide;
-
     if (!(actor->spr.cstat & CSTAT_SPRITE_RESTORE))
     {
         SpawnUser(actor,EEL_RUN_R0,s_EelRun[0]);

diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h
@@ -386,7 +386,6 @@ enum  FOOT_TYPE
 {WATER_FOOT, BLOOD_FOOT};
 
 extern FOOT_TYPE FootMode;
-ANIMATOR QueueFloorBlood;                // Weapon.c
 int QueueFootPrint(DSWActor*);                 // Weapon.c
 void QueueLoWangs(DSWActor*);                   // Weapon.c
 int SpawnShell(DSWActor* actor, int ShellNum);     // JWeapon.c
@@ -1391,8 +1390,6 @@ extern SECTOR_OBJECT SectorObject[MAX_SECTOR_OBJECTS];
 //
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-ANIMATOR NullAnimator;
-
 int NewStateGroup(DSWActor* actor, STATE* SpriteGroup[]);
 DVector3 SectorMidPoint(sectortype* sectp);
 void SpawnUser(DSWActor* actor, short id, STATE* state);

diff --git a/source/games/sw/src/girlninj.cpp b/source/games/sw/src/girlninj.cpp
@@ -430,7 +430,6 @@ STATE* sg_GirlNinjaFall[] =
 //////////////////////
 
 #define GIRLNINJA_PAIN_RATE 15
-ANIMATOR DoGirlNinjaPain;
 
 STATE s_GirlNinjaPain[5][1] =
 {
@@ -529,7 +528,6 @@ STATE* sg_GirlNinjaSticky[] =
 //////////////////////
 
 #define GIRLNINJA_CROSSBOW_RATE 14
-ANIMATOR InitEnemyCrossbow;
 
 STATE s_GirlNinjaCrossbow[5][5] =
 {
@@ -589,7 +587,6 @@ STATE* sg_GirlNinjaCrossbow[] =
 //////////////////////
 
 #define GIRLNINJA_DIE_RATE 30
-ANIMATOR DoGirlNinjaSpecial;
 
 STATE s_GirlNinjaDie[] =
 {
@@ -714,8 +711,6 @@ ACTOR_ACTION_SET GirlNinjaActionSet =
 
 int SetupGirlNinja(DSWActor* actor)
 {
-    ANIMATOR DoActorDecide;
-
     if (!(actor->spr.cstat & CSTAT_SPRITE_RESTORE))
     {
         SpawnUser(actor, GIRLNINJA_RUN_R0, s_GirlNinjaRun[0]);

diff --git a/source/games/sw/src/goro.cpp b/source/games/sw/src/goro.cpp
@@ -169,8 +169,6 @@ STATE* sg_GoroRun[] =
 //////////////////////
 
 #define GORO_CHOP_RATE 14
-ANIMATOR InitActorDecide;
-ANIMATOR InitGoroChop;
 
 STATE s_GoroChop[5][7] =
 {
@@ -359,7 +357,6 @@ STATE* sg_GoroStand[] =
 //////////////////////
 
 #define GORO_PAIN_RATE 12
-ANIMATOR DoGoroPain;
 
 STATE s_GoroPain[5][1] =
 {
@@ -487,8 +484,6 @@ ACTOR_ACTION_SET GoroActionSet =
 
 int SetupGoro(DSWActor* actor)
 {
-    ANIMATOR DoActorDecide;
-
     if (!(actor->spr.cstat & CSTAT_SPRITE_RESTORE))
     {
         SpawnUser(actor, GORO_RUN_R0,s_GoroRun[0]);

diff --git a/source/games/sw/src/hornet.cpp b/source/games/sw/src/hornet.cpp
@@ -287,8 +287,6 @@ int DoHornetMatchPlayerZ(DSWActor* actor);
 
 int SetupHornet(DSWActor* actor)
 {
-    ANIMATOR DoActorDecide;
-
     if (!(actor->spr.cstat & CSTAT_SPRITE_RESTORE))
     {
         SpawnUser(actor,HORNET_RUN_R0,s_HornetRun[0]);

diff --git a/source/games/sw/src/jweapon.cpp b/source/games/sw/src/jweapon.cpp
@@ -43,11 +43,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 BEGIN_SW_NS
 
-ANIMATOR DoSuicide;
-ANIMATOR DoBloodSpray;
 void SpawnFlashBombOnActor(DSWActor* actor);
 
-ANIMATOR DoPuff;
 extern STATE s_Puff[];
 extern STATE s_FireballFlames[];
 extern STATE s_GoreFloorSplash[];

diff --git a/source/games/sw/src/lava.cpp b/source/games/sw/src/lava.cpp
@@ -217,8 +217,6 @@ STATE* sg_LavaRun[] =
 //////////////////////
 
 #define LAVA_THROW_RATE 9
-ANIMATOR InitActorDecide;
-ANIMATOR InitLavaThrow;
 
 STATE s_LavaThrow[5][10] =
 {
@@ -302,7 +300,6 @@ STATE* sg_LavaThrow[] =
 //////////////////////
 
 #define LAVA_FLAME_RATE 18
-ANIMATOR InitLavaFlame;
 
 STATE s_LavaFlame[5][8] =
 {
@@ -457,8 +454,6 @@ ACTOR_ACTION_SET LavaActionSet =
 
 int SetupLava(DSWActor* actor)
 {
-    ANIMATOR DoActorDecide;
-
     if (!(actor->spr.cstat & CSTAT_SPRITE_RESTORE))
     {
         SpawnUser(actor, LAVA_RUN_R0, s_LavaRun[0]);

diff --git a/source/games/sw/src/ripper2.cpp b/source/games/sw/src/ripper2.cpp
@@ -37,11 +37,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 BEGIN_SW_NS
 
-ANIMATOR InitRipper2Hang;
-ANIMATOR DoRipper2MoveJump;
-ANIMATOR DoRipper2HangJF;
-ANIMATOR DoRipper2QuickJump;
-ANIMATOR InitRipper2Charge;
+ANIMATOR InitRipper2Hang, InitRipper2Charge;
 
 DECISION Ripper2Battle[] =
 {
@@ -260,8 +256,6 @@ STATE* sg_Ripper2Stand[] =
 //////////////////////
 
 #define RIPPER2_SWIPE_RATE 14
-ANIMATOR InitActorDecide;
-ANIMATOR InitRipperSlash;
 
 STATE s_Ripper2Swipe[5][8] =
 {
@@ -334,7 +328,6 @@ STATE* sg_Ripper2Swipe[] =
 //////////////////////
 
 #define RIPPER2_MEKONG_RATE 18
-ANIMATOR ChestRipper2;
 
 STATE s_Ripper2Kong[5][7] =
 {
@@ -403,7 +396,6 @@ STATE* sg_Ripper2Kong[] =
 //////////////////////
 
 #define RIPPER2_HEART_RATE 20
-ANIMATOR DoRipper2StandHeart;
 
 STATE s_Ripper2Heart[5][4] =
 {
@@ -446,7 +438,6 @@ STATE* sg_Ripper2Heart[] =
 //////////////////////
 
 #define RIPPER2_HANG_RATE 14
-ANIMATOR DoRipper2Hang;
 
 STATE s_Ripper2Hang[5][4] =
 {
@@ -485,7 +476,6 @@ STATE* sg_Ripper2Hang[] =
 //////////////////////
 
 #define RIPPER2_PAIN_RATE 38
-ANIMATOR DoRipper2Pain;
 
 STATE s_Ripper2Pain[5][1] =
 {
@@ -886,8 +876,6 @@ ACTOR_ACTION_SET Ripper2BrownActionSet =
 
 int SetupRipper2(DSWActor* actor)
 {
-    ANIMATOR DoActorDecide;
-
     if (!(actor->spr.cstat & CSTAT_SPRITE_RESTORE))
     {
         SpawnUser(actor, RIPPER2_RUN_R0, s_Ripper2Run[0]);
@@ -1039,6 +1027,7 @@ int DoRipper2MoveHang(DSWActor* actor)
 // 
 //
 //---------------------------------------------------------------------------
+int DoRipper2QuickJump(DSWActor* actor);
 
 int DoRipper2HangJF(DSWActor* actor)
 {
@@ -1356,7 +1345,6 @@ static saveable_code saveable_ripper2_code[] =
 
     SAVE_CODE(DoRipper2BeginJumpAttack),
     SAVE_CODE(DoRipper2MoveJump),
-    SAVE_CODE(DoRipper2QuickJump),
     SAVE_CODE(NullRipper2),
     SAVE_CODE(DoRipper2Pain),
     SAVE_CODE(DoRipper2RipHeart),

diff --git a/source/games/sw/src/serp.cpp b/source/games/sw/src/serp.cpp
@@ -180,8 +180,6 @@ STATE* sg_SerpRun[] =
 //////////////////////
 
 #define SERP_SLASH_RATE 9
-ANIMATOR InitActorDecide;
-ANIMATOR InitSerpSlash;
 
 STATE s_SerpSlash[5][10] =
 {
@@ -265,8 +263,6 @@ STATE* sg_SerpSlash[] =
 //////////////////////
 
 #define SERP_SKULL_SPELL_RATE 18
-ANIMATOR InitSerpSkullSpell;
-ANIMATOR InitSerpRing;
 
 STATE s_SerpSkullSpell[5][8] =
 {
@@ -341,7 +337,6 @@ STATE* sg_SerpSkullSpell[] =
 //////////////////////
 
 #define SERP_SPELL_RATE 18
-ANIMATOR InitSerpSpell;
 
 STATE s_SerpSpell[5][8] =
 {
@@ -413,8 +408,6 @@ STATE* sg_SerpSpell[] =
 //
 //////////////////////
 
-ANIMATOR InitSerpMonstSpell;
-
 STATE s_SerpMonstSpell[5][8] =
 {
     {
@@ -487,7 +480,6 @@ STATE* sg_SerpMonstSpell[] =
 //////////////////////
 
 #define SERP_SPELL_RATE 18
-ANIMATOR InitSerpRapidSpell;
 
 STATE s_SerpRapidSpell[5][10] =
 {
@@ -607,7 +599,6 @@ STATE* sg_SerpStand[] =
 //////////////////////
 
 #define SERP_DIE_RATE 20
-ANIMATOR DoDeathSpecial;
 
 STATE s_SerpDie[] =
 {
@@ -693,8 +684,6 @@ ACTOR_ACTION_SET SerpActionSet =
 
 int SetupSerp(DSWActor* actor)
 {
-    ANIMATOR DoActorDecide;
-
     if (!(actor->spr.cstat & CSTAT_SPRITE_RESTORE))
     {
         SpawnUser(actor,SERP_RUN_R0,s_SerpRun[0]);

diff --git a/source/games/sw/src/skel.cpp b/source/games/sw/src/skel.cpp
@@ -176,8 +176,6 @@ STATE* sg_SkelRun[] =
 //////////////////////
 
 #define SKEL_SLASH_RATE 20
-ANIMATOR InitActorDecide;
-ANIMATOR InitSkelSlash;
 
 STATE s_SkelSlash[5][7] =
 {
@@ -313,7 +311,6 @@ STATE* sg_SkelSpell[] =
 //////////////////////
 
 #define SKEL_PAIN_RATE 38
-ANIMATOR DoSkelPain;
 
 STATE s_SkelPain[5][1] =
 {
@@ -504,8 +501,6 @@ ACTOR_ACTION_SET SkelActionSet =
 
 int SetupSkel(DSWActor* actor)
 {
-    ANIMATOR DoActorDecide;
-
     if (!(actor->spr.cstat & CSTAT_SPRITE_RESTORE))
     {
         SpawnUser(actor,SKEL_RUN_R0,s_SkelRun[0]);

diff --git a/source/games/sw/src/skull.cpp b/source/games/sw/src/skull.cpp
@@ -47,10 +47,8 @@ int InitCaltrops(DSWActor* actor);
 
 
 extern DAMAGE_DATA DamageData[];
-ANIMATOR DoSkullMove,DoActorDebris;
 
 #define SKULL_RATE 10
-ANIMATOR DoSkullWait;
 
 STATE s_SkullWait[5][1] =
 {
@@ -98,8 +96,6 @@ ATTRIBUTE SkullAttrib =
 //
 //////////////////////
 
-ANIMATOR DoSerpRing;
-
 STATE s_SkullRing[5][1] =
 {
     {
@@ -137,8 +133,6 @@ STATE* sg_SkullRing[] =
 //
 //////////////////////
 
-ANIMATOR DoSkullJump;
-
 STATE s_SkullJump[5][1] =
 {
     {
@@ -213,8 +207,6 @@ STATE* sg_SkullExplode[] =
 
 int SetupSkull(DSWActor* actor)
 {
-    ANIMATOR DoActorDecide;
-
     if (!(actor->spr.cstat & CSTAT_SPRITE_RESTORE))
     {
         SpawnUser(actor,SKULL_R0,s_SkullWait[0]);
@@ -566,8 +558,6 @@ ATTRIBUTE BettyAttrib =
 //
 //////////////////////
 
-ANIMATOR DoBettyJump;
-
 STATE s_BettyJump[5][1] =
 {
     {
@@ -606,8 +596,6 @@ STATE* sg_BettyJump[] =
 
 #define BETTY_EXPLODE_RATE 11
 #define BETTY_EXPLODE BETTY_R0
-ANIMATOR DoSuicide;
-ANIMATOR DoBettySpawnShrap;
 
 STATE s_BettyExplode[] =
 {
@@ -629,8 +617,6 @@ STATE* sg_BettyExplode[] =
 
 int SetupBetty(DSWActor* actor)
 {
-    ANIMATOR DoActorDecide;
-
     if (!(actor->spr.cstat & CSTAT_SPRITE_RESTORE))
     {
         SpawnUser(actor,BETTY_R0,s_BettyWait[0]);