From 280d68577413f8280105ccc57335a44609750fe7 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 24 May 2023 18:51:14 +0200 Subject: [PATCH] - get rid of more ANIMATOR declarations. --- source/games/sw/src/ai.cpp | 1 - source/games/sw/src/bunny.cpp | 2 -- source/games/sw/src/coolg.cpp | 2 -- source/games/sw/src/coolie.cpp | 2 -- source/games/sw/src/hornet.cpp | 5 ----- source/games/sw/src/ripper.cpp | 2 -- source/games/sw/src/ripper2.cpp | 2 -- source/games/sw/src/sector.cpp | 1 - source/games/sw/src/sprite.cpp | 21 --------------------- source/games/sw/src/sumo.cpp | 2 -- 10 files changed, 40 deletions(-) diff --git a/source/games/sw/src/ai.cpp b/source/games/sw/src/ai.cpp index 4798eb96d..47b95ea43 100644 --- a/source/games/sw/src/ai.cpp +++ b/source/games/sw/src/ai.cpp @@ -40,7 +40,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms BEGIN_SW_NS -ANIMATOR InitActorRunToward; bool DropAhead(DSWActor* actor, double min_height); VMFunction* ChooseAction(DECISION decision[]); diff --git a/source/games/sw/src/bunny.cpp b/source/games/sw/src/bunny.cpp index ce23fa914..342b4047c 100644 --- a/source/games/sw/src/bunny.cpp +++ b/source/games/sw/src/bunny.cpp @@ -725,8 +725,6 @@ ACTOR_ACTION_SET BunnyWhiteActionSet = int SetupBunny(DSWActor* actor) { - ANIMATOR DoActorDecide; - if (!(actor->spr.cstat & CSTAT_SPRITE_RESTORE)) { SpawnUser(actor, BUNNY_RUN_R0, s_BunnyRun[0]); diff --git a/source/games/sw/src/coolg.cpp b/source/games/sw/src/coolg.cpp index 3cdae91aa..369d4327e 100644 --- a/source/games/sw/src/coolg.cpp +++ b/source/games/sw/src/coolg.cpp @@ -37,8 +37,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms BEGIN_SW_NS -ANIMATOR DoCoolgCircle,InitCoolgCircle; - const int COOLG_BOB_AMT = 8; DECISION CoolgBattle[] = diff --git a/source/games/sw/src/coolie.cpp b/source/games/sw/src/coolie.cpp index 889959353..c6917a8e5 100644 --- a/source/games/sw/src/coolie.cpp +++ b/source/games/sw/src/coolie.cpp @@ -37,8 +37,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms BEGIN_SW_NS -ANIMATOR InitCoolieCharge; - DECISION CoolieBattle[] = { {700, AF(InitCoolieCharge ) }, diff --git a/source/games/sw/src/hornet.cpp b/source/games/sw/src/hornet.cpp index 48599635a..8d2c2e3be 100644 --- a/source/games/sw/src/hornet.cpp +++ b/source/games/sw/src/hornet.cpp @@ -37,9 +37,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms BEGIN_SW_NS -ANIMATOR DoHornetCircle, InitHornetCircle; - - DECISION HornetBattle[] = { {50, AF(InitHornetCircle ) }, @@ -86,8 +83,6 @@ DECISION HornetCloseRange[] = {1024, AF(InitActorReposition) } }; -ANIMATOR InitHornetSting; - DECISION HornetTouchTarget[] = { {500, AF(InitHornetCircle) }, diff --git a/source/games/sw/src/ripper.cpp b/source/games/sw/src/ripper.cpp index 341786d8b..6c5071117 100644 --- a/source/games/sw/src/ripper.cpp +++ b/source/games/sw/src/ripper.cpp @@ -38,8 +38,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms BEGIN_SW_NS -ANIMATOR InitRipperHang; - DECISION RipperBattle[] = { {748, AF(InitActorMoveCloser)}, diff --git a/source/games/sw/src/ripper2.cpp b/source/games/sw/src/ripper2.cpp index 90258af23..494b34c24 100644 --- a/source/games/sw/src/ripper2.cpp +++ b/source/games/sw/src/ripper2.cpp @@ -37,8 +37,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms BEGIN_SW_NS -ANIMATOR InitRipper2Hang, InitRipper2Charge; - DECISION Ripper2Battle[] = { {879, AF(InitRipper2Charge)}, diff --git a/source/games/sw/src/sector.cpp b/source/games/sw/src/sector.cpp index e325f1d5c..a82b89908 100644 --- a/source/games/sw/src/sector.cpp +++ b/source/games/sw/src/sector.cpp @@ -58,7 +58,6 @@ enum SINE_SLOPED = BIT(3), }; -ANIMATOR DoGrating; void DoPlayerBeginForceJump(PLAYER*); sectortype* FindNextSectorByTag(sectortype* sect, int tag); diff --git a/source/games/sw/src/sprite.cpp b/source/games/sw/src/sprite.cpp index bbcd1ae08..ab9a3e5fa 100644 --- a/source/games/sw/src/sprite.cpp +++ b/source/games/sw/src/sprite.cpp @@ -228,7 +228,6 @@ STATE* s_Key[] = #define RED_COIN_RATE 10 #define YELLOW_COIN_RATE 8 #define GREEN_COIN_RATE 6 -ANIMATOR DoCoin; STATE s_RedCoin[] = { {Red_COIN + 0, RED_COIN_RATE, AF(DoCoin), &s_RedCoin[1]}, @@ -266,9 +265,6 @@ STATE s_GreenCoin[] = {Green_COIN + 7, GREEN_COIN_RATE, AF(DoCoin), &s_GreenCoin[0]}, }; -ANIMATOR DoFireFly; - - STATE s_FireFly[] = { {FIRE_FLY0, FIRE_FLY_RATE * 4, AF(DoFireFly), &s_FireFly[0]} @@ -1929,23 +1925,6 @@ void SpriteSetup(void) break; } -#if 0 - case SECT_DEBRIS_SEWER: - { - ANIMATOR DoGenerateSewerDebris; - - SpawnUser(actor, 0, nullptr); - - ASSERT(actor->hasU()); - actor->user.__legacyState.RotNum = 0; - actor->user.WaitTics = actor->spr.lotag * 120; - - actor->user.__legacyState.ActorActionFunc = DoGenerateSewerDebris; - - change_actor_stat(actor, STAT_NO_STATE); - break; - } -#endif case SECT_VATOR: { diff --git a/source/games/sw/src/sumo.cpp b/source/games/sw/src/sumo.cpp index c7a1fe850..82605b3a4 100644 --- a/source/games/sw/src/sumo.cpp +++ b/source/games/sw/src/sumo.cpp @@ -51,8 +51,6 @@ bool bosswasseen[3]; DSWActor* BossSpriteNum[3]; -ANIMATOR InitSumoCharge; - DECISION SumoBattle[] = { {690, AF(InitActorMoveCloser) },