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:
commit
4fcca22343
|
@ -2735,7 +2735,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
|
||||||
// Step up
|
// Step up
|
||||||
if (thing->z < tmfloorz)
|
if (thing->z < tmfloorz)
|
||||||
{
|
{
|
||||||
if (tmfloorz - thing->z <= maxstep)
|
if (maxstep > 0 && tmfloorz - thing->z <= maxstep)
|
||||||
{
|
{
|
||||||
thing->z = thing->floorz = tmfloorz;
|
thing->z = thing->floorz = tmfloorz;
|
||||||
thing->floorrover = tmfloorrover;
|
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)
|
else if (tmceilingz < thingtop)
|
||||||
{
|
{
|
||||||
if (thingtop - tmceilingz <= maxstep)
|
if (maxstep > 0 && thingtop - tmceilingz <= maxstep)
|
||||||
{
|
{
|
||||||
thing->z = ( thing->ceilingz = tmceilingz ) - thing->height;
|
thing->z = ( thing->ceilingz = tmceilingz ) - thing->height;
|
||||||
thing->ceilingrover = tmceilingrover;
|
thing->ceilingrover = tmceilingrover;
|
||||||
|
|
Loading…
Reference in New Issue