mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-12-22 02:30:55 +00:00
Do not apply pmomz when jumping through a platform
This commit is contained in:
parent
1470d099e3
commit
c907c20480
1 changed files with 8 additions and 5 deletions
13
src/p_map.c
13
src/p_map.c
|
@ -3065,11 +3065,14 @@ static boolean P_ThingHeightClip(mobj_t *thing)
|
||||||
if (!rover || ((rover->fofflags & FOF_EXISTS) && (rover->fofflags & FOF_SOLID)))
|
if (!rover || ((rover->fofflags & FOF_EXISTS) && (rover->fofflags & FOF_SOLID)))
|
||||||
{
|
{
|
||||||
hitfloor = bouncing;
|
hitfloor = bouncing;
|
||||||
if (thing->eflags & MFE_VERTICALFLIP)
|
if (!(thing->player) || !(thing->player->pflags & PF_JUMPED || bouncing))
|
||||||
thing->pmomz = thing->ceilingz - (thing->z + thing->height);
|
{
|
||||||
else
|
if (thing->eflags & MFE_VERTICALFLIP)
|
||||||
thing->pmomz = thing->floorz - thing->z;
|
thing->pmomz = thing->ceilingz - (thing->z + thing->height);
|
||||||
thing->eflags |= MFE_APPLYPMOMZ;
|
else
|
||||||
|
thing->pmomz = thing->floorz - thing->z;
|
||||||
|
thing->eflags |= MFE_APPLYPMOMZ;
|
||||||
|
}
|
||||||
|
|
||||||
if (thing->eflags & MFE_VERTICALFLIP)
|
if (thing->eflags & MFE_VERTICALFLIP)
|
||||||
thing->z = thing->ceilingz - thing->height;
|
thing->z = thing->ceilingz - thing->height;
|
||||||
|
|
Loading…
Reference in a new issue