teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- serp.cpp

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-02 21:45:47 +01:00
parent 7704042df4
commit 07f61e061e
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -695,22 +695,20 @@ ACTOR_ACTION_SET SerpActionSet =
nullptr
};
int
SetupSerp(short SpriteNum)
int SetupSerp(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,SERP_RUN_R0,s_SerpRun[0]);
u = SpawnUser(actor,SERP_RUN_R0,s_SerpRun[0]);
u->Health = HEALTH_SERP_GOD;
}
@ -757,7 +755,6 @@ SetupSerp(short SpriteNum)
int NullSerp(DSWActor* actor)
{
USER* u = actor->u();
int SpriteNum = u->SpriteNum;
if (TEST(u->Flags,SPR_SLIDING))
DoActorSlide(actor);
@ -771,8 +768,7 @@ int NullSerp(DSWActor* actor)
int DoSerpMove(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);
@ -814,8 +810,7 @@ int DoSerpMove(DSWActor* actor)
int DoDeathSpecial(DSWActor* actor)
{
USER* u = actor->u();
int SpriteNum = u->SpriteNum;
SPRITEp sp = &sprite[SpriteNum];
SPRITEp sp = &actor->s();
DoMatchEverything(nullptr, sp->lotag, ON);

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

@ -70,7 +70,7 @@ int SetupTrashCan(DSWActor*);
int SetupBunny(DSWActor*);
int SetupRipper(DSWActor*);
int SetupRipper2(DSWActor*);
int SetupSerp(short);
int SetupSerp(DSWActor*);
int SetupLava(DSWActor* actor);
int SetupSkel(short);
int SetupHornet(DSWActor*);
@ -1459,7 +1459,7 @@ ActorSpawn(SPRITEp sp)
}
PicAnimOff(sp->picnum);
SetupSerp(SpriteNum);
SetupSerp(actor);
break;
}