From d1d1098f7caee6274be52185e984886ba8509e89 Mon Sep 17 00:00:00 2001 From: Monster Iestyn <iestynjealous@ntlworld.com> Date: Tue, 19 Nov 2019 12:31:20 -0500 Subject: [PATCH] fix object type restrictions for popping monitors (MT_BOUNCERING to MT_GRENADERING are actually the ammo pickups, MT_THROWNBOUNCE to MT_THROWNGRENADE are what actually want here) --- src/p_inter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_inter.c b/src/p_inter.c index f68cb90f0b..a51a4e8e6c 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -3532,7 +3532,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da // Make sure that boxes cannot be popped by enemies, red rings, etc. if (target->flags & MF_MONITOR && ((!source || !source->player || source->player->bot) - || (inflictor && inflictor->type >= MT_REDRING && inflictor->type <= MT_GRENADERING))) + || (inflictor && (inflictor->type == MT_REDRING || (inflictor->type >= MT_THROWNBOUNCE && inflictor->type <= MT_THROWNGRENADE))))) return false; } -- GitLab