teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-21 11:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- EnemyDefaults.

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-31 21:17:31 +01:00
parent 7b778f692b
commit ef23f69072
20 changed files with 51 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/games/sw/src/bunny.cpp
View file

@ -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);

4
source/games/sw/src/coolg.cpp
View file

@ -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--;

16
source/games/sw/src/coolie.cpp
View file

@ -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;

2
source/games/sw/src/eel.cpp
View file

@ -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);

2
source/games/sw/src/game.h
View file

@ -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);

2
source/games/sw/src/girlninj.cpp
View file

@ -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);

2
source/games/sw/src/goro.cpp
View file

@ -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);

2
source/games/sw/src/hornet.cpp
View file

@ -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);

2
source/games/sw/src/lava.cpp
View file

@ -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);

24
source/games/sw/src/miscactr.cpp
View file

@ -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;

10
source/games/sw/src/ninja.cpp
View file

@ -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;

4
source/games/sw/src/ripper.cpp
View file

@ -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);

4
source/games/sw/src/ripper2.cpp
View file

@ -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);

2
source/games/sw/src/serp.cpp
View file

@ -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)

2
source/games/sw/src/skel.cpp
View file

@ -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;

4
source/games/sw/src/skull.cpp
View file

@ -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);

2
source/games/sw/src/sumo.cpp
View file

@ -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)

7
source/games/sw/src/weapon.cpp
View file

@ -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);

2
source/games/sw/src/zilla.cpp
View file

@ -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;

2
source/games/sw/src/zombie.cpp
View file

@ -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);