From 82b17eb7b990a0a151391c6f91f89dcffe3e0ed7 Mon Sep 17 00:00:00 2001 From: GenericHeroGuy Date: Thu, 6 Feb 2025 02:52:43 +0100 Subject: [PATCH] Fix crumbling FOF in Ancient Tomb (and missing flags for pushables) What a fucking ride... I spent an hour stepping through T_StartCrumble and P_CheckSector and whatnot only to realize the gargoyle isn't supposed to have MF_PUSHABLE because it has the ambush flag set --- src/p_mobj.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/p_mobj.c b/src/p_mobj.c index bf49f56a3..736b29238 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -12049,6 +12049,25 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean if (mthing->args[1]) // No egg trap for this boss mobj->flags2 |= MF2_BOSSNOTRAP; } + if (mobj->flags & MF_PUSHABLE) + { + switch (mthing->args[0]) + { + case TMP_NORMAL: + default: + break; + case TMP_SLIDE: + mobj->flags2 |= MF2_SLIDEPUSH; + mobj->flags |= MF_BOUNCE; + break; + case TMP_IMMOVABLE: + mobj->flags &= ~MF_PUSHABLE; + break; + case TMP_CLASSIC: + mobj->flags2 |= MF2_CLASSICPUSH; + break; + } + } return true; }