From a74fcf7c490ee2aab332f63368aaa8008061acd6 Mon Sep 17 00:00:00 2001
From: MIDIMan <miditheman2.0@gmail.com>
Date: Sat, 27 Jul 2024 22:37:12 -0400
Subject: [PATCH] Re-add player check(s) for MF_SPECIAL objects in
PIT_DoCheckThing
---
src/p_map.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/p_map.c b/src/p_map.c
index b79f9d45c7..c742e2e85e 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -1465,13 +1465,13 @@ static unsigned PIT_DoCheckThing(mobj_t *thing)
}
// check for special pickup
- if (thing->flags & MF_SPECIAL)
+ if (thing->flags & MF_SPECIAL && (tmthing->player || (tmthing->flags & MF_PUSHABLE))) // MF_PUSHABLE added for steam jets
{
P_TouchSpecialThing(thing, tmthing, true); // can remove thing
return CHECKTHING_COLLIDE;
}
// check again for special pickup
- if (tmthing->flags & MF_SPECIAL)
+ if (tmthing->flags & MF_SPECIAL && (thing->player || (thing->flags & MF_PUSHABLE))) // MF_PUSHABLE added for steam jets
{
P_TouchSpecialThing(tmthing, thing, true); // can remove thing
return CHECKTHING_COLLIDE;
--
GitLab