From bf35469684a529b82909674579cfc8cfb76802a9 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 4 Mar 2024 04:08:29 +0100 Subject: [PATCH] Revert "Fix players constantly JUSTHITFLOOR at the top of slopes" This reverts commit 5b7720fe658ff7a5642762aaac343213328228ef. --- src/p_mobj.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 4df49e2b2..9452a55f5 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -1512,10 +1512,8 @@ void P_XYMovement(mobj_t *mo) FIXED_TO_FLOAT(AngleFixed(oldangle-newangle)) );*/ // Sryder 2018-11-26: Don't launch here if it's a slope without physics, we stick to those like glue anyway - } else if ((predictedz-mo->z > abs(slopemom.z/2) // Now check if we were supposed to stick to this slope - && !(mo->standingslope->flags & SL_NOPHYSICS) - && (!(mo->eflags & MFE_VERTICALFLIP) && (mo->z <= mo->floorz))) // mo->z <= mo->floorz means 'only do this if we did a stairstep up' - || ((mo->eflags & MFE_VERTICALFLIP) && (mo->z+mo->height >= mo->ceilingz))) { + } else if (predictedz-mo->z > abs(slopemom.z/2) + && !(mo->standingslope->flags & SL_NOPHYSICS)) { // Now check if we were supposed to stick to this slope //CONS_Printf("%d-%d > %d\n", (predictedz), (mo->z), (slopemom.z/2)); P_SlopeLaunch(mo); }