From ef23f69072070efde5b50853a36dfea00ba76b6d Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 31 Oct 2021 21:17:31 +0100 Subject: [PATCH] - EnemyDefaults. --- source/games/sw/src/bunny.cpp | 6 +++--- source/games/sw/src/coolg.cpp | 4 ++-- source/games/sw/src/coolie.cpp | 16 ++++++++-------- source/games/sw/src/eel.cpp | 2 +- source/games/sw/src/game.h | 2 +- source/games/sw/src/girlninj.cpp | 2 +- source/games/sw/src/goro.cpp | 2 +- source/games/sw/src/hornet.cpp | 2 +- source/games/sw/src/lava.cpp | 2 +- source/games/sw/src/miscactr.cpp | 24 ++++++++++++------------ source/games/sw/src/ninja.cpp | 10 +++++----- source/games/sw/src/ripper.cpp | 4 ++-- source/games/sw/src/ripper2.cpp | 4 ++-- source/games/sw/src/serp.cpp | 2 +- source/games/sw/src/skel.cpp | 2 +- source/games/sw/src/skull.cpp | 4 ++-- source/games/sw/src/sumo.cpp | 2 +- source/games/sw/src/weapon.cpp | 7 ++++--- source/games/sw/src/zilla.cpp | 2 +- source/games/sw/src/zombie.cpp | 2 +- 20 files changed, 51 insertions(+), 50 deletions(-) diff --git a/source/games/sw/src/bunny.cpp b/source/games/sw/src/bunny.cpp index 97563bdc0..220685193 100644 --- a/source/games/sw/src/bunny.cpp +++ b/source/games/sw/src/bunny.cpp @@ -759,7 +759,7 @@ int SetupBunny(DSWActor* actor) if (sp->pal == PALETTE_PLAYER1) { - EnemyDefaults(actor->GetSpriteIndex(), &BunnyWhiteActionSet, &WhiteBunnyPersonality); + EnemyDefaults(actor, &BunnyWhiteActionSet, &WhiteBunnyPersonality); u->Attrib = &WhiteBunnyAttrib; sp->xrepeat = 96; sp->yrepeat = 90; @@ -771,7 +771,7 @@ int SetupBunny(DSWActor* actor) } else if (sp->pal == PALETTE_PLAYER8) // Male Rabbit { - EnemyDefaults(actor->GetSpriteIndex(), &BunnyActionSet, &BunnyPersonality); + EnemyDefaults(actor, &BunnyActionSet, &BunnyPersonality); u->Attrib = &BunnyAttrib; //sp->xrepeat = 76; //sp->yrepeat = 70; @@ -784,7 +784,7 @@ int SetupBunny(DSWActor* actor) else { // Female Rabbit - EnemyDefaults(actor->GetSpriteIndex(), &BunnyActionSet, &BunnyPersonality); + EnemyDefaults(actor, &BunnyActionSet, &BunnyPersonality); u->Attrib = &BunnyAttrib; u->spal = sp->pal = PALETTE_PLAYER0; u->Flag1 = SEC(5); diff --git a/source/games/sw/src/coolg.cpp b/source/games/sw/src/coolg.cpp index a3b13a15f..2bbc46a83 100644 --- a/source/games/sw/src/coolg.cpp +++ b/source/games/sw/src/coolg.cpp @@ -536,7 +536,7 @@ int SetupCoolg(DSWActor* actor) u->StateEnd = s_CoolgDie; u->Rot = sg_CoolgRun; - EnemyDefaults(SpriteNum, &CoolgActionSet, &CoolgPersonality); + EnemyDefaults(actor, &CoolgActionSet, &CoolgPersonality); SET(u->Flags, SPR_NO_SCAREDZ|SPR_XFLIP_TOGGLE); @@ -592,7 +592,7 @@ int DoCoolgBirth(DSWActor* actor) u->StateEnd = s_CoolgDie; u->Rot = sg_CoolgRun; - EnemyDefaults(actor->GetSpriteIndex(), &CoolgActionSet, &CoolgPersonality); + EnemyDefaults(actor, &CoolgActionSet, &CoolgPersonality); // special case TotalKillable--; diff --git a/source/games/sw/src/coolie.cpp b/source/games/sw/src/coolie.cpp index c3d3fc544..b4ee9b5b3 100644 --- a/source/games/sw/src/coolie.cpp +++ b/source/games/sw/src/coolie.cpp @@ -404,9 +404,9 @@ ACTOR_ACTION_SET CoolieActionSet = nullptr }; -void EnemyDefaults(short SpriteNum, ACTOR_ACTION_SETp action, PERSONALITYp person) +// later. This is used by multiple enemies. +void EnemyDefaults(DSWActor* actor, ACTOR_ACTION_SETp action, PERSONALITYp person) { - auto actor = &swActors[SpriteNum]; USERp u = actor->u(); SPRITEp sp = &actor->s(); unsigned int wpn; @@ -461,13 +461,13 @@ void EnemyDefaults(short SpriteNum, ACTOR_ACTION_SETp action, PERSONALITYp perso SET(sp->cstat,CSTAT_SPRITE_BLOCK|CSTAT_SPRITE_BLOCK_HITSCAN); SET(sp->extra,SPRX_PLAYER_OR_ENEMY); - sprite[SpriteNum].picnum = u->State->Pic; + sp->picnum = u->State->Pic; change_actor_stat(actor, STAT_ENEMY); u->Personality = person; u->ActorActionSet = action; - DoActorZrange(SpriteNum); + DoActorZrange(actor->GetSpriteIndex()); //KeepActorOnFloor(actor); // for swimming actors @@ -483,10 +483,10 @@ void EnemyDefaults(short SpriteNum, ACTOR_ACTION_SETp action, PERSONALITYp perso } else { - SectIterator it(sectnum); - while ((i = it.NextIndex()) >= 0) + SWSectIterator it(sectnum); + while (auto itActor = it.Next()) { - SPRITEp np = &sprite[i]; + SPRITEp np = &itActor->s(); if (np->picnum == ST1 && np->hitag == SECT_SINK) { depth = np->lotag; @@ -548,7 +548,7 @@ SetupCoolie(short SpriteNum) u->StateEnd = s_CoolieDie; u->Rot = sg_CoolieRun; - EnemyDefaults(SpriteNum, &CoolieActionSet, &CooliePersonality); + EnemyDefaults(actor, &CoolieActionSet, &CooliePersonality); sp->xrepeat = 42; sp->yrepeat = 42; diff --git a/source/games/sw/src/eel.cpp b/source/games/sw/src/eel.cpp index b40d9c90e..8eb7586be 100644 --- a/source/games/sw/src/eel.cpp +++ b/source/games/sw/src/eel.cpp @@ -400,7 +400,7 @@ SetupEel(short SpriteNum) u->StateEnd = s_EelDie; u->Rot = sg_EelRun; - EnemyDefaults(SpriteNum, &EelActionSet, &EelPersonality); + EnemyDefaults(actor, &EelActionSet, &EelPersonality); SET(u->Flags, SPR_NO_SCAREDZ|SPR_XFLIP_TOGGLE); diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h index cc40ec822..5d1df768d 100644 --- a/source/games/sw/src/game.h +++ b/source/games/sw/src/game.h @@ -1966,7 +1966,7 @@ short AnimSet(int animtype, int animindex, int thegoal, int thevel); short AnimSetCallback(short anim_ndx, ANIM_CALLBACKp call, SECTOR_OBJECTp data); short AnimSetVelAdj(short anim_ndx, short vel_adj); -void EnemyDefaults(short SpriteNum, ACTOR_ACTION_SETp action, PERSONALITYp person); +void EnemyDefaults(DSWActor* actor, ACTOR_ACTION_SETp action, PERSONALITYp person); void getzrangepoint(int x, int y, int z, short sectnum, int32_t* ceilz, int32_t* ceilhit, int32_t* florz, int32_t* florhit); int move_sprite(int spritenum, int xchange, int ychange, int zchange, int ceildist, int flordist, uint32_t cliptype, int numtics); diff --git a/source/games/sw/src/girlninj.cpp b/source/games/sw/src/girlninj.cpp index 0c926b33f..ed3c4a882 100644 --- a/source/games/sw/src/girlninj.cpp +++ b/source/games/sw/src/girlninj.cpp @@ -738,7 +738,7 @@ SetupGirlNinja(short SpriteNum) u->Attrib = &GirlNinjaAttrib; sp->pal = u->spal = 26; - EnemyDefaults(SpriteNum, &GirlNinjaActionSet, &GirlNinjaPersonality); + EnemyDefaults(actor, &GirlNinjaActionSet, &GirlNinjaPersonality); ChangeState(actor, s_GirlNinjaRun[0]); DoActorSetSpeed(actor, NORM_SPEED); diff --git a/source/games/sw/src/goro.cpp b/source/games/sw/src/goro.cpp index c60824f05..95a1726d8 100644 --- a/source/games/sw/src/goro.cpp +++ b/source/games/sw/src/goro.cpp @@ -507,7 +507,7 @@ SetupGoro(short SpriteNum) u->Rot = sg_GoroRun; - EnemyDefaults(SpriteNum, &GoroActionSet, &GoroPersonality); + EnemyDefaults(actor, &GoroActionSet, &GoroPersonality); sp->clipdist = 512 >> 2; SET(u->Flags, SPR_XFLIP_TOGGLE); diff --git a/source/games/sw/src/hornet.cpp b/source/games/sw/src/hornet.cpp index 412babb10..ec5b30765 100644 --- a/source/games/sw/src/hornet.cpp +++ b/source/games/sw/src/hornet.cpp @@ -312,7 +312,7 @@ SetupHornet(short SpriteNum) u->StateEnd = s_HornetDie; u->Rot = sg_HornetRun; - EnemyDefaults(SpriteNum, &HornetActionSet, &HornetPersonality); + EnemyDefaults(actor, &HornetActionSet, &HornetPersonality); SET(u->Flags, SPR_NO_SCAREDZ|SPR_XFLIP_TOGGLE); SET(sp->cstat, CSTAT_SPRITE_YCENTER); diff --git a/source/games/sw/src/lava.cpp b/source/games/sw/src/lava.cpp index 4f2b24792..aa68f14d7 100644 --- a/source/games/sw/src/lava.cpp +++ b/source/games/sw/src/lava.cpp @@ -476,7 +476,7 @@ SetupLava(short SpriteNum) u->StateEnd = s_LavaDie; u->Rot = sg_LavaRun; - EnemyDefaults(SpriteNum, &LavaActionSet, &LavaPersonality); + EnemyDefaults(actor, &LavaActionSet, &LavaPersonality); sp->xrepeat = sp->yrepeat = 110; sp->clipdist = (512) >> 2; SET(u->Flags, SPR_XFLIP_TOGGLE|SPR_ELECTRO_TOLERANT); diff --git a/source/games/sw/src/miscactr.cpp b/source/games/sw/src/miscactr.cpp index cbe00019d..474c2d364 100644 --- a/source/games/sw/src/miscactr.cpp +++ b/source/games/sw/src/miscactr.cpp @@ -130,7 +130,7 @@ SetupToiletGirl(short SpriteNum) } - EnemyDefaults(SpriteNum, nullptr, nullptr); + EnemyDefaults(actor, nullptr, nullptr); ChangeState(actor,s_ToiletGirlStand); u->Attrib = &ToiletGirlAttrib; @@ -374,7 +374,7 @@ SetupWashGirl(short SpriteNum) u->Health = 60; } - EnemyDefaults(SpriteNum, nullptr, nullptr); + EnemyDefaults(actor, nullptr, nullptr); ChangeState(actor,s_WashGirlStand); u->Attrib = &WashGirlAttrib; @@ -587,7 +587,7 @@ SetupTrashCan(short SpriteNum) u->Health = 60; } - EnemyDefaults(SpriteNum, nullptr, nullptr); + EnemyDefaults(actor, nullptr, nullptr); ChangeState(actor,s_TrashCanStand); u->Attrib = &TrashCanAttrib; @@ -698,7 +698,7 @@ SetupPachinkoLight(short SpriteNum) u->Health = 1; } - EnemyDefaults(SpriteNum, nullptr, nullptr); + EnemyDefaults(actor, nullptr, nullptr); ChangeState(actor,s_PachinkoLightStand); u->Attrib = &PachinkoLightAttrib; @@ -801,7 +801,7 @@ SetupPachinko1(short SpriteNum) u->Health = 1; } - EnemyDefaults(SpriteNum, nullptr, nullptr); + EnemyDefaults(actor, nullptr, nullptr); ChangeState(actor,s_Pachinko1Stand); u->Attrib = &Pachinko1Attrib; @@ -974,7 +974,7 @@ SetupPachinko2(short SpriteNum) u->Health = 1; } - EnemyDefaults(SpriteNum, nullptr, nullptr); + EnemyDefaults(actor, nullptr, nullptr); ChangeState(actor,s_Pachinko2Stand); u->Attrib = &Pachinko2Attrib; @@ -1059,7 +1059,7 @@ SetupPachinko3(short SpriteNum) u->Health = 1; } - EnemyDefaults(SpriteNum, nullptr, nullptr); + EnemyDefaults(actor, nullptr, nullptr); ChangeState(actor,s_Pachinko3Stand); u->Attrib = &Pachinko3Attrib; @@ -1145,7 +1145,7 @@ SetupPachinko4(short SpriteNum) u->Health = 1; } - EnemyDefaults(SpriteNum, nullptr, nullptr); + EnemyDefaults(actor, nullptr, nullptr); ChangeState(actor,s_Pachinko4Stand); u->Attrib = &Pachinko4Attrib; @@ -1260,7 +1260,7 @@ SetupCarGirl(short SpriteNum) } - EnemyDefaults(SpriteNum, nullptr, nullptr); + EnemyDefaults(actor, nullptr, nullptr); ChangeState(actor,s_CarGirlStand); u->Attrib = &CarGirlAttrib; @@ -1484,7 +1484,7 @@ SetupMechanicGirl(short SpriteNum) } - EnemyDefaults(SpriteNum, nullptr, nullptr); + EnemyDefaults(actor, nullptr, nullptr); ChangeState(actor,s_MechanicGirlStand); u->Attrib = &MechanicGirlAttrib; @@ -1707,7 +1707,7 @@ SetupSailorGirl(short SpriteNum) } - EnemyDefaults(SpriteNum, nullptr, nullptr); + EnemyDefaults(actor, nullptr, nullptr); ChangeState(actor,s_SailorGirlStand); u->Attrib = &SailorGirlAttrib; @@ -1924,7 +1924,7 @@ SetupPruneGirl(short SpriteNum) } - EnemyDefaults(SpriteNum, nullptr, nullptr); + EnemyDefaults(actor, nullptr, nullptr); ChangeState(actor,s_PruneGirlStand); u->Attrib = &PruneGirlAttrib; diff --git a/source/games/sw/src/ninja.cpp b/source/games/sw/src/ninja.cpp index be8c0fa25..2a172e811 100644 --- a/source/games/sw/src/ninja.cpp +++ b/source/games/sw/src/ninja.cpp @@ -1847,7 +1847,7 @@ SetupNinja(short SpriteNum) if (sp->pal == PALETTE_PLAYER5) { u->Attrib = &InvisibleNinjaAttrib; - EnemyDefaults(SpriteNum, &NinjaGreenActionSet, &NinjaPersonality); + EnemyDefaults(actor, &NinjaGreenActionSet, &NinjaPersonality); if (!TEST(sp->cstat, CSTAT_SPRITE_RESTORE)) u->Health = RedNinjaHealth; SET(sp->cstat, CSTAT_SPRITE_TRANSLUCENT); @@ -1875,7 +1875,7 @@ SetupNinja(short SpriteNum) else if (sp->pal == PALETTE_PLAYER3) { u->Attrib = &NinjaAttrib; - EnemyDefaults(SpriteNum, &NinjaRedActionSet, &NinjaPersonality); + EnemyDefaults(actor, &NinjaRedActionSet, &NinjaPersonality); if (!TEST(sp->cstat, CSTAT_SPRITE_RESTORE)) u->Health = RedNinjaHealth; sp->pal = u->spal = PALETTE_PLAYER3; @@ -1900,7 +1900,7 @@ SetupNinja(short SpriteNum) else if (sp->pal == PAL_XLAT_LT_TAN) { u->Attrib = &NinjaAttrib; - EnemyDefaults(SpriteNum, &NinjaSeekerActionSet, &NinjaPersonality); + EnemyDefaults(actor, &NinjaSeekerActionSet, &NinjaPersonality); if (!TEST(sp->cstat, CSTAT_SPRITE_RESTORE)) u->Health = RedNinjaHealth; sp->pal = u->spal = PAL_XLAT_LT_TAN; @@ -1909,7 +1909,7 @@ SetupNinja(short SpriteNum) else if (sp->pal == PAL_XLAT_LT_GREY) { u->Attrib = &NinjaAttrib; - EnemyDefaults(SpriteNum, &NinjaGrenadeActionSet, &NinjaPersonality); + EnemyDefaults(actor, &NinjaGrenadeActionSet, &NinjaPersonality); if (!TEST(sp->cstat, CSTAT_SPRITE_RESTORE)) u->Health = RedNinjaHealth; sp->pal = u->spal = PAL_XLAT_LT_GREY; @@ -1919,7 +1919,7 @@ SetupNinja(short SpriteNum) { u->Attrib = &NinjaAttrib; sp->pal = u->spal = PALETTE_PLAYER0; - EnemyDefaults(SpriteNum, &NinjaActionSet, &NinjaPersonality); + EnemyDefaults(actor, &NinjaActionSet, &NinjaPersonality); if (pic == NINJA_CRAWL_R0) { u->Attrib = &NinjaAttrib; diff --git a/source/games/sw/src/ripper.cpp b/source/games/sw/src/ripper.cpp index d6003538d..9a55d9a28 100644 --- a/source/games/sw/src/ripper.cpp +++ b/source/games/sw/src/ripper.cpp @@ -843,7 +843,7 @@ SetupRipper(short SpriteNum) if (sp->pal == PALETTE_BROWN_RIPPER) { - EnemyDefaults(SpriteNum, &RipperBrownActionSet, &RipperPersonality); + EnemyDefaults(actor, &RipperBrownActionSet, &RipperPersonality); sp->xrepeat = 106; sp->yrepeat = 90; @@ -854,7 +854,7 @@ SetupRipper(short SpriteNum) } else { - EnemyDefaults(SpriteNum, &RipperActionSet, &RipperPersonality); + EnemyDefaults(actor, &RipperActionSet, &RipperPersonality); } SET(u->Flags, SPR_XFLIP_TOGGLE); diff --git a/source/games/sw/src/ripper2.cpp b/source/games/sw/src/ripper2.cpp index a67f9bf56..41a4cb036 100644 --- a/source/games/sw/src/ripper2.cpp +++ b/source/games/sw/src/ripper2.cpp @@ -911,7 +911,7 @@ SetupRipper2(short SpriteNum) if (sp->pal == PALETTE_BROWN_RIPPER) { - EnemyDefaults(SpriteNum, &Ripper2BrownActionSet, &Ripper2Personality); + EnemyDefaults(actor, &Ripper2BrownActionSet, &Ripper2Personality); sp->xrepeat += 40; sp->yrepeat += 40; @@ -922,7 +922,7 @@ SetupRipper2(short SpriteNum) } else { - EnemyDefaults(SpriteNum, &Ripper2ActionSet, &Ripper2Personality); + EnemyDefaults(actor, &Ripper2ActionSet, &Ripper2Personality); } SET(u->Flags, SPR_XFLIP_TOGGLE); diff --git a/source/games/sw/src/serp.cpp b/source/games/sw/src/serp.cpp index dc2a17d14..cef2042b7 100644 --- a/source/games/sw/src/serp.cpp +++ b/source/games/sw/src/serp.cpp @@ -723,7 +723,7 @@ SetupSerp(short SpriteNum) u->StateEnd = s_SerpDie; u->Rot = sg_SerpRun; - EnemyDefaults(SpriteNum, &SerpActionSet, &SerpPersonality); + EnemyDefaults(actor, &SerpActionSet, &SerpPersonality); // Mini-Boss Serp if (sp->pal == 16) diff --git a/source/games/sw/src/skel.cpp b/source/games/sw/src/skel.cpp index b7ddcb1c9..53288d6e4 100644 --- a/source/games/sw/src/skel.cpp +++ b/source/games/sw/src/skel.cpp @@ -525,7 +525,7 @@ SetupSkel(short SpriteNum) u->StateEnd = s_SkelDie; u->Rot = sg_SkelRun; - EnemyDefaults(SpriteNum, &SkelActionSet, &SkelPersonality); + EnemyDefaults(actor, &SkelActionSet, &SkelPersonality); // 256 is default //sp->clipdist = 256 >> 2; diff --git a/source/games/sw/src/skull.cpp b/source/games/sw/src/skull.cpp index c83bccb02..5b930afb1 100644 --- a/source/games/sw/src/skull.cpp +++ b/source/games/sw/src/skull.cpp @@ -236,7 +236,7 @@ SetupSkull(short SpriteNum) u->ID = SKULL_R0; - EnemyDefaults(SpriteNum, nullptr, nullptr); + EnemyDefaults(actor, nullptr, nullptr); sp->clipdist = (128+64) >> 2; SET(u->Flags, SPR_XFLIP_TOGGLE); SET(sp->cstat, CSTAT_SPRITE_YCENTER); @@ -657,7 +657,7 @@ SetupBetty(short SpriteNum) u->ID = BETTY_R0; - EnemyDefaults(SpriteNum, nullptr, nullptr); + EnemyDefaults(actor, nullptr, nullptr); sp->clipdist = (128+64) >> 2; SET(u->Flags, SPR_XFLIP_TOGGLE); SET(sp->cstat, CSTAT_SPRITE_YCENTER); diff --git a/source/games/sw/src/sumo.cpp b/source/games/sw/src/sumo.cpp index aef1a6991..225556289 100644 --- a/source/games/sw/src/sumo.cpp +++ b/source/games/sw/src/sumo.cpp @@ -655,7 +655,7 @@ SetupSumo(short SpriteNum) u->StateEnd = s_SumoDie; u->Rot = sg_SumoRun; - EnemyDefaults(SpriteNum, &SumoActionSet, &SumoPersonality); + EnemyDefaults(actor, &SumoActionSet, &SumoPersonality); sp->clipdist = (512) >> 2; if (sp->pal == 16) diff --git a/source/games/sw/src/weapon.cpp b/source/games/sw/src/weapon.cpp index 0d4f862ed..cdc4f897f 100644 --- a/source/games/sw/src/weapon.cpp +++ b/source/games/sw/src/weapon.cpp @@ -12972,7 +12972,7 @@ InitSerpRing(DSWActor* actor) for (missiles = 0, ang = ang_start; missiles < max_missiles; ang += ang_diff, missiles++) { New = SpawnSprite(STAT_SKIP4, SKULL_SERP, &s_SkullRing[0][0], sp->sectnum, sp->x, sp->y, sp->z, ang, 0); - + auto actorNew = &swActors[New]; np = &sprite[New]; nu = User[New].Data(); @@ -13006,7 +13006,7 @@ InitSerpRing(DSWActor* actor) nu->Rot = sg_SkullRing; // defaults do change the statnum - EnemyDefaults(New, nullptr, nullptr); + EnemyDefaults(actorNew, nullptr, nullptr); change_sprite_stat(New, STAT_SKIP4); RESET(np->extra, SPRX_PLAYER_OR_ENEMY); @@ -13790,6 +13790,7 @@ InitSumoSkull(short SpriteNum) PlaySound(DIGI_SERPSUMMONHEADS, sp, v3df_none); New = SpawnSprite(STAT_ENEMY, SKULL_R0, &s_SkullWait[0][0], sp->sectnum, sp->x, sp->y, SPRITEp_MID(sp), sp->ang, 0); + auto actorNew = &swActors[New]; np = &sprite[New]; nu = User[New].Data(); @@ -13818,7 +13819,7 @@ InitSumoSkull(short SpriteNum) nu->Health = 100; // defaults do change the statnum - EnemyDefaults(New, nullptr, nullptr); + EnemyDefaults(actorNew, nullptr, nullptr); //change_sprite_stat(New, STAT_SKIP4); SET(np->extra, SPRX_PLAYER_OR_ENEMY); diff --git a/source/games/sw/src/zilla.cpp b/source/games/sw/src/zilla.cpp index 75d9f7e19..b15cc00e1 100644 --- a/source/games/sw/src/zilla.cpp +++ b/source/games/sw/src/zilla.cpp @@ -668,7 +668,7 @@ SetupZilla(short SpriteNum) u->StateEnd = s_ZillaDie; u->Rot = sg_ZillaRun; - EnemyDefaults(SpriteNum, &ZillaActionSet, &ZillaPersonality); + EnemyDefaults(actor, &ZillaActionSet, &ZillaPersonality); sp->clipdist = (512) >> 2; sp->xrepeat = 97; diff --git a/source/games/sw/src/zombie.cpp b/source/games/sw/src/zombie.cpp index 738dc998b..3eb220fbe 100644 --- a/source/games/sw/src/zombie.cpp +++ b/source/games/sw/src/zombie.cpp @@ -763,7 +763,7 @@ SetupZombie(short SpriteNum) sp->yrepeat = PLAYER_NINJA_YREPEAT; u->Attrib = &ZombieAttrib; - EnemyDefaults(SpriteNum, &ZombieActionSet, &ZombiePersonality); + EnemyDefaults(actor, &ZombieActionSet, &ZombiePersonality); ChangeState(actor, s_ZombieRun[0]); DoActorSetSpeed(actor, NORM_SPEED);