stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-20 18:01:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prevent immediate re-flipping after a per-sector gravity flip

Browse source
This commit is contained in:
spherallic 2022-09-11 23:12:51 +02:00
parent 42fc6c877b
commit 3427d4309f
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_mobj.c
View file

@ -1434,6 +1434,7 @@ fixed_t P_GetMobjGravity(mobj_t *mo)
boolean no3dfloorgrav = true; // Custom gravity
boolean goopgravity = false;
boolean wasflip;
boolean alreadyflipped = false;
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo));
@ -1466,6 +1467,7 @@ fixed_t P_GetMobjGravity(mobj_t *mo)
if (rover->master->frontsector->specialflags & SSF_GRAVITYOVERRIDE)
mo->flags2 &= ~MF2_OBJECTFLIP;
mo->eflags |= MFE_VERTICALFLIP;
alreadyflipped = true;
}
no3dfloorgrav = false;
@ -1482,6 +1484,7 @@ fixed_t P_GetMobjGravity(mobj_t *mo)
if (mo->subsector->sector->specialflags & SSF_GRAVITYOVERRIDE)
mo->flags2 &= ~MF2_OBJECTFLIP;
mo->eflags |= MFE_VERTICALFLIP;
alreadyflipped = true;
}
}
@ -1500,7 +1503,8 @@ fixed_t P_GetMobjGravity(mobj_t *mo)
if (!(mo->flags2 & MF2_OBJECTFLIP) != !(mo->player->powers[pw_gravityboots])) // negated to turn numeric into bool - would be double negated, but not needed if both would be
{
gravityadd = -gravityadd;
mo->eflags ^= MFE_VERTICALFLIP;
if (!alreadyflipped) // prevent re-flipping after a per-sector gravity flip
mo->eflags ^= MFE_VERTICALFLIP;
}
if (wasflip == !(mo->eflags & MFE_VERTICALFLIP)) // note!! == ! is not equivalent to != here - turns numeric into bool this way
P_PlayerFlip(mo);