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

Fix unsigned/signed comparisons.

This commit is contained in:
toaster 2019-10-27 11:18:37 +00:00
parent a58c794691
commit c221a89c67
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/p_user.c
View File

@ -10977,10 +10977,11 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume)
panim_t panim = player->panim; panim_t panim = player->panim;
tic_t dashmode = player->dashmode; tic_t dashmode = player->dashmode;
boolean underwater = mo->eflags & MFE_UNDERWATER; boolean underwater = mo->eflags & MFE_UNDERWATER;
statenum_t stat = fume->state-states;
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 (stat != fume->info->spawnstate)
P_SetMobjState(fume, fume->info->spawnstate); P_SetMobjState(fume, fume->info->spawnstate);
return; return;
} }
@ -11015,19 +11016,19 @@ 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 (stat != fume->info->spawnstate)
P_SetMobjState(fume, fume->info->spawnstate); P_SetMobjState(fume, fume->info->spawnstate);
return; return;
} }
} }
if (fume->state-states == fume->info->spawnstate) // If currently inivisble, activate! if (stat == fume->info->spawnstate) // If currently inivisble, activate!
{ {
P_SetMobjState(fume, fume->info->seestate); P_SetMobjState(fume, (stat = fume->info->seestate));
P_SetScale(fume, mo->scale); P_SetScale(fume, mo->scale);
} }
if (dashmode > DASHMODE_THRESHOLD && fume->state-states != fume->info->seestate) // If in dashmode, grow really big and flash if (dashmode > DASHMODE_THRESHOLD && stat != fume->info->seestate) // If in dashmode, grow really big and flash
{ {
fume->destscale = mo->scale; fume->destscale = mo->scale;
fume->flags2 ^= MF2_DONTDRAW; fume->flags2 ^= MF2_DONTDRAW;
@ -11035,9 +11036,9 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume)
} }
else // Otherwise, pick a size and color depending on speed and proximity to dashmode else // Otherwise, pick a size and color depending on speed and proximity to dashmode
{ {
if (dashmode == DASHMODE_THRESHOLD && dashmode > fume->movecount) // If just about to enter dashmode, play the startup animation again if (dashmode == DASHMODE_THRESHOLD && dashmode > (tic_t)fume->movecount) // If just about to enter dashmode, play the startup animation again
{ {
P_SetMobjState(fume, fume->info->seestate); P_SetMobjState(fume, (stat = fume->info->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);