lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove imtermediary state transitions

This commit is contained in:
lachwright 2019-10-26 08:32:36 +08:00
parent ca768b044d
commit aa34f74f75
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/p_user.c
View File

@ -10930,7 +10930,7 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume)
if (panim != PA_WALK && panim != PA_RUN && panim != PA_DASH) // turn invisible when not in a coherent movement state if (panim != PA_WALK && panim != PA_RUN && panim != PA_DASH) // turn invisible when not in a coherent movement state
{ {
if (fume->state-states != fume->info->spawnstate) if (fume->state-states != fume->info->spawnstate)
P_SetMobjState(fume, S_SPAWNSTATE); P_SetMobjState(fume, fume->info->spawnstate);
return; return;
} }
@ -10965,14 +10965,14 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume)
if (panim == PA_WALK) if (panim == PA_WALK)
{ {
if (fume->state-states != fume->info->spawnstate) if (fume->state-states != fume->info->spawnstate)
P_SetMobjState(fume, S_SPAWNSTATE); P_SetMobjState(fume, fume->info->spawnstate);
return; return;
} }
} }
if (fume->state-states == fume->info->spawnstate) // If currently inivisble, activate! if (fume->state-states == fume->info->spawnstate) // If currently inivisble, activate!
{ {
P_SetMobjState(fume, S_SEESTATE); P_SetMobjState(fume, fume->info->seestate);
P_SetScale(fume, mo->scale); P_SetScale(fume, mo->scale);
} }
@ -10986,7 +10986,7 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume)
{ {
if (dashmode == DASHMODE_THRESHOLD && dashmode > fume->movecount) // If just about to enter dashmode, play the startup animation again if (dashmode == DASHMODE_THRESHOLD && dashmode > fume->movecount) // If just about to enter dashmode, play the startup animation again
{ {
P_SetMobjState(fume, S_SEESTATE); P_SetMobjState(fume, fume->seestate);
P_SetScale(fume, mo->scale << 1); P_SetScale(fume, mo->scale << 1);
} }
fume->flags2 = (fume->flags2 & ~MF2_DONTDRAW) | (mo->flags2 & MF2_DONTDRAW); fume->flags2 = (fume->flags2 & ~MF2_DONTDRAW) | (mo->flags2 & MF2_DONTDRAW);