mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-05-05 00:12:16 +00:00
Merge branch 'firefuck2' into 'master'
Firefuck II Closes #310 See merge request STJr/SRB2Internal!512
This commit is contained in:
commit
bd097d5564
1 changed files with 5 additions and 2 deletions
|
|
@ -7743,9 +7743,12 @@ void P_ElementalFire(player_t *player, boolean cropcircle)
|
||||||
I_Assert(!P_MobjWasRemoved(player->mo));
|
I_Assert(!P_MobjWasRemoved(player->mo));
|
||||||
|
|
||||||
if (player->mo->eflags & MFE_VERTICALFLIP)
|
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
|
else
|
||||||
ground = player->mo->floorz + 1;
|
ground = player->mo->floorz;
|
||||||
|
|
||||||
|
if (cropcircle)
|
||||||
|
ground += P_MobjFlip(player->mo);
|
||||||
|
|
||||||
if (cropcircle)
|
if (cropcircle)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue