From b5afc70cc82e49049d60bb4285b0f51063dbd723 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Mon, 2 May 2016 17:04:28 +0100
Subject: [PATCH] Hack to fix DSZ2 left route waterslide: apply Red's step up
changes only to slopes
that is, I believe slopes are why he added this code anyway *shrugs*
---
src/p_map.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/p_map.c b/src/p_map.c
index 612f152201..7ed28751f3 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -1969,22 +1969,28 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
thing->z = (thing->ceilingz = thingtop = tmceilingz) - thing->height;
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
}
- else if (tmceilingz < thingtop && thingtop - tmceilingz <= maxstep)
+#ifdef ESLOPE
+ // HACK TO FIX DSZ2: apply only if slopes are involved
+ else if (tmceilingslope && tmceilingz < thingtop && thingtop - tmceilingz <= maxstep)
{
thing->z = (thing->ceilingz = thingtop = tmceilingz) - thing->height;
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
}
+#endif
}
else if (thing->z == thing->floorz && tmfloorz < thing->z && thing->z - tmfloorz <= maxstep)
{
thing->z = thing->floorz = tmfloorz;
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
}
- else if (tmfloorz > thing->z && tmfloorz - thing->z <= maxstep)
+#ifdef ESLOPE
+ // HACK TO FIX DSZ2: apply only if slopes are involved
+ else if (tmfloorslope && tmfloorz > thing->z && tmfloorz - thing->z <= maxstep)
{
thing->z = thing->floorz = tmfloorz;
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
}
+#endif
}
if (thing->eflags & MFE_VERTICALFLIP)
--
GitLab