lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'step-up-goofs-2' into 'next' 

Fix disabling step up/down not working

See merge request STJr/SRB2!1219
This commit is contained in:
James R 2020-11-09 17:52:41 -05:00
parent 202d2126c9 18a2e87093
commit 4fcca22343
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/p_map.c
View File

@ -2735,7 +2735,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
// Step up
if (thing->z < tmfloorz)
{
if (tmfloorz - thing->z <= maxstep)
if (maxstep > 0 && tmfloorz - thing->z <= maxstep)
{
thing->z = thing->floorz = tmfloorz;
thing->floorrover = tmfloorrover;
@ -2748,7 +2748,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
}
else if (tmceilingz < thingtop)
{
if (thingtop - tmceilingz <= maxstep)
if (maxstep > 0 && thingtop - tmceilingz <= maxstep)
{
thing->z = ( thing->ceilingz = tmceilingz ) - thing->height;
thing->ceilingrover = tmceilingrover;