Merge branch 'metal-fume-opacity' into 'next'
Make Metal Sonic's jet fume opaque when re-emerging from water See merge request STJr/SRB2!612
This commit is contained in:
commit
f77188ef0f
|
@ -11251,7 +11251,10 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume)
|
||||||
if (panim == PA_WALK)
|
if (panim == PA_WALK)
|
||||||
{
|
{
|
||||||
if (stat != fume->info->spawnstate)
|
if (stat != fume->info->spawnstate)
|
||||||
|
{
|
||||||
|
fume->threshold = 0;
|
||||||
P_SetMobjState(fume, fume->info->spawnstate);
|
P_SetMobjState(fume, fume->info->spawnstate);
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -11282,6 +11285,12 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume)
|
||||||
if (underwater)
|
if (underwater)
|
||||||
{
|
{
|
||||||
fume->frame = (fume->frame & FF_FRAMEMASK) | FF_ANIMATE | (P_RandomRange(0, 9) * FF_TRANS10);
|
fume->frame = (fume->frame & FF_FRAMEMASK) | FF_ANIMATE | (P_RandomRange(0, 9) * FF_TRANS10);
|
||||||
|
fume->threshold = 1;
|
||||||
|
}
|
||||||
|
else if (fume->threshold)
|
||||||
|
{
|
||||||
|
fume->frame = (fume->frame & FF_FRAMEMASK) | fume->state->frame;
|
||||||
|
fume->threshold = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue