Merge branch 'firefuck2' into 'master'

Firefuck II

Closes #310

See merge request STJr/SRB2Internal!512
This commit is contained in:
MascaraSnake 2019-11-23 17:51:02 -05:00
commit 5715727724
1 changed files with 5 additions and 2 deletions

View File

@ -7743,9 +7743,12 @@ void P_ElementalFire(player_t *player, boolean cropcircle)
I_Assert(!P_MobjWasRemoved(player->mo));
if (player->mo->eflags & MFE_VERTICALFLIP)
ground = player->mo->ceilingz - FixedMul(mobjinfo[MT_SPINFIRE].height - 1, player->mo->scale);
ground = player->mo->ceilingz - FixedMul(mobjinfo[MT_SPINFIRE].height, player->mo->scale);
else
ground = player->mo->floorz + 1;
ground = player->mo->floorz;
if (cropcircle)
ground += P_MobjFlip(player->mo);
if (cropcircle)
{