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

- renamed u-> in goro.cpp

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-25 21:10:17 +01:00
parent 43e370f079
commit 89c9031486
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -494,19 +494,19 @@ int SetupGoro(DSWActor* actor)
else else
{ {
u = SpawnUser(actor, GORO_RUN_R0,s_GoroRun[0]); u = SpawnUser(actor, GORO_RUN_R0,s_GoroRun[0]);
u->Health = HEALTH_GORO; actor->user.Health = HEALTH_GORO;
} }
ChangeState(actor, s_GoroRun[0]); ChangeState(actor, s_GoroRun[0]);
u->Attrib = &GoroAttrib; actor->user.Attrib = &GoroAttrib;
DoActorSetSpeed(actor, NORM_SPEED); DoActorSetSpeed(actor, NORM_SPEED);
u->StateEnd = s_GoroDie; actor->user.StateEnd = s_GoroDie;
u->Rot = sg_GoroRun; actor->user.Rot = sg_GoroRun;
EnemyDefaults(actor, &GoroActionSet, &GoroPersonality); EnemyDefaults(actor, &GoroActionSet, &GoroPersonality);
actor->spr.clipdist = 512 >> 2; actor->spr.clipdist = 512 >> 2;
SET(u->Flags, SPR_XFLIP_TOGGLE); SET(actor->user.Flags, SPR_XFLIP_TOGGLE);
return 0; return 0;
} }
@ -515,7 +515,7 @@ int NullGoro(DSWActor* actor)
{ {
USER* u = actor->u(); USER* u = actor->u();
if (TEST(u->Flags,SPR_SLIDING)) if (TEST(actor->user.Flags,SPR_SLIDING))
DoActorSlide(actor); DoActorSlide(actor);
KeepActorOnFloor(actor); KeepActorOnFloor(actor);
@ -530,7 +530,7 @@ int DoGoroPain(DSWActor* actor)
NullGoro(actor); NullGoro(actor);
if ((u->WaitTics -= ACTORMOVETICS) <= 0) if ((actor->user.WaitTics -= ACTORMOVETICS) <= 0)
InitActorDecide(actor); InitActorDecide(actor);
return 0; return 0;
} }
@ -539,13 +539,13 @@ int DoGoroMove(DSWActor* actor)
{ {
USER* u = actor->u(); USER* u = actor->u();
if (TEST(u->Flags,SPR_SLIDING)) if (TEST(actor->user.Flags,SPR_SLIDING))
DoActorSlide(actor); DoActorSlide(actor);
if (u->track >= 0) if (actor->user.track >= 0)
ActorFollowTrack(actor, ACTORMOVETICS); ActorFollowTrack(actor, ACTORMOVETICS);
else else
(*u->ActorActionFunc)(actor); (*actor->user.ActorActionFunc)(actor);
KeepActorOnFloor(actor); KeepActorOnFloor(actor);