From a860c068d8852c531f1ae23a9fd8c53c2cdeb98b Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Fri, 2 Sep 2016 22:53:55 +0100
Subject: [PATCH] BONUS UNRELATED FIX: Fix FF_SHATTERBOTTOM FOFs acting like
THZ goop when stood on
---
src/p_map.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/p_map.c b/src/p_map.c
index d8c48fa4f..c4616db48 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -1271,7 +1271,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
topheight = P_GetFOFTopZ(thing, newsubsec->sector, rover, x, y, NULL);
bottomheight = P_GetFOFBottomZ(thing, newsubsec->sector, rover, x, y, NULL);
- if (rover->flags & FF_GOOWATER && !(thing->flags & MF_NOGRAVITY))
+ if ((rover->flags & (FF_SWIMMABLE|FF_GOOWATER)) == (FF_SWIMMABLE|FF_GOOWATER) && !(thing->flags & MF_NOGRAVITY))
{
// If you're inside goowater and slowing down
fixed_t sinklevel = FixedMul(thing->info->height/6, thing->scale);
--
GitLab