From 37f844a5e4e2041d639bec17f5bc1c0401ff670c Mon Sep 17 00:00:00 2001
From: Snu <coolzach5@gmail.com>
Date: Sun, 7 Feb 2021 14:11:40 +0000
Subject: [PATCH] Remove quicksand checks
---
src/p_map.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/p_map.c b/src/p_map.c
index b4fa2e9e0..09a4e96ce 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -5028,23 +5028,16 @@ fixed_t P_CeilingzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
fixed_t topheight, bottomheight;
if (!(rover->flags & FF_EXISTS))
continue;
+
+ if (rover->flags & FF_QUICKSAND)
+ continue;
- if ((!(rover->flags & FF_SOLID || rover->flags & FF_QUICKSAND) || (rover->flags & FF_SWIMMABLE)))
+ if ((!(rover->flags & FF_SOLID) || (rover->flags & FF_SWIMMABLE)))
continue;
topheight = P_GetFFloorTopZAt (rover, x, y);
bottomheight = P_GetFFloorBottomZAt(rover, x, y);
- if (rover->flags & FF_QUICKSAND)
- {
- if (thingtop > bottomheight && topheight > z)
- {
- if (ceilingz > z)
- ceilingz = z;
- }
- continue;
- }
-
delta1 = z - (bottomheight + ((topheight - bottomheight)/2));
delta2 = thingtop - (bottomheight + ((topheight - bottomheight)/2));
if (bottomheight < ceilingz && abs(delta1) > abs(delta2))
--
GitLab