zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- coolie.cpp

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-31 21:45:52 +01:00
parent ef23f69072
commit f41d68b376
2 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -523,22 +523,20 @@ void EnemyDefaults(DSWActor* actor, ACTOR_ACTION_SETp action, PERSONALITYp perso
u->WeaponNum = int8_t(wpn_cnt);
}
int
SetupCoolie(short SpriteNum)
int SetupCoolie(DSWActor* actor)
{
auto actor = &swActors[SpriteNum];
SPRITEp sp = &sprite[SpriteNum];
SPRITEp sp = &actor->s();
USERp u;
ANIMATOR DoActorDecide;
if (TEST(sp->cstat, CSTAT_SPRITE_RESTORE))
{
u = User[SpriteNum].Data();
u = actor->u();
ASSERT(u);
}
else
{
u = SpawnUser(SpriteNum,COOLIE_RUN_R0,s_CoolieRun[0]);
u = SpawnUser(actor,COOLIE_RUN_R0,s_CoolieRun[0]);
u->Health = HEALTH_COOLIE;
}
@ -563,7 +561,6 @@ int NewCoolg(DSWActor*);
int SpawnCoolg(DSWActor* actor)
{
USER* u = actor->u();
int SpriteNum = u->SpriteNum;
// Don't do a ghost every time
if (RandomRange(1000) > 700 || Skill < MinEnemySkill - 1)
@ -572,7 +569,6 @@ int SpawnCoolg(DSWActor* actor)
}
NewCoolg(actor);
PlaySpriteSound(actor,attr_extra1,v3df_follow);
return 0;
@ -581,7 +577,6 @@ int SpawnCoolg(DSWActor* actor)
int CooliePain(DSWActor* actor)
{
USER* u = actor->u();
int SpriteNum = u->SpriteNum;
if (TEST(u->Flags,SPR_SLIDING))
DoActorSlide(actor);
@ -600,7 +595,6 @@ int CooliePain(DSWActor* actor)
int NullCoolie(DSWActor* actor)
{
USER* u = actor->u();
int SpriteNum = u->SpriteNum;
if (TEST(u->Flags,SPR_SLIDING))
DoActorSlide(actor);
@ -616,14 +610,13 @@ int NullCoolie(DSWActor* actor)
int DoCoolieMove(DSWActor* actor)
{
USER* u = actor->u();
int SpriteNum = u->SpriteNum;
SPRITEp sp = &sprite[SpriteNum];
SPRITEp sp = &actor->s();
if (TEST(u->Flags,SPR_SLIDING))
DoActorSlide(actor);
if (u->track >= 0)
ActorFollowTrack(SpriteNum, ACTORMOVETICS);
ActorFollowTrack(actor->GetSpriteIndex(), ACTORMOVETICS);
else
(*u->ActorActionFunc)(actor);
@ -648,8 +641,7 @@ int DoCoolieMove(DSWActor* actor)
int InitCoolieCharge(DSWActor* actor)
{
USER* u = actor->u();
int SpriteNum = u->SpriteNum;
SPRITEp sp = &sprite[SpriteNum];
SPRITEp sp = &actor->s();
if (RANDOM_P2(1024) > 950)
PlaySound(DIGI_COOLIESCREAM, sp, v3df_follow);
@ -668,7 +660,6 @@ int
DoCoolieWaitBirth(DSWActor* actor)
{
USER* u = actor->u();
int SpriteNum = u->SpriteNum;
if ((u->Counter -= ACTORMOVETICS) <= 0)
{

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

@ -53,7 +53,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
BEGIN_SW_NS
int SetupCoolie(short);
int SetupCoolie(DSWActor*);
int SetupNinja(short);
int SetupGoro(short);
int SetupCoolg(DSWActor*);
@ -1188,7 +1188,7 @@ ActorSpawn(SPRITEp sp)
}
PicAnimOff(sp->picnum);
SetupCoolie(SpriteNum);
SetupCoolie(actor);
break;
}