From 290fc9f81f680a5357382bc501a91e86649664a0 Mon Sep 17 00:00:00 2001 From: SMS Alfredo <65426124+SMS-Alfredo@users.noreply.github.com> Date: Thu, 5 Oct 2023 12:04:46 -0500 Subject: [PATCH] Restore Ringslinger Collectable Behavior --- src/p_mobj.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/p_mobj.c b/src/p_mobj.c index 1be7ced7a..1818875c5 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -2386,6 +2386,23 @@ boolean P_ZMovement(mobj_t *mo) // Remove from death pits. DON'T FUCKING DESPAWN IT DAMMIT mo->fuse = 1; return false; + case MT_BOUNCERING: + case MT_INFINITYRING: + case MT_AUTOMATICRING: + case MT_RAILRING: + case MT_EXPLOSIONRING: + case MT_SCATTERRING: + case MT_GRENADERING: + case MT_BOUNCEPICKUP: + case MT_RAILPICKUP: + case MT_AUTOPICKUP: + case MT_EXPLODEPICKUP: + case MT_SCATTERPICKUP: + case MT_GRENADEPICKUP: + //Don't remove respawning ringslinger collectables on death pits + if (!(mo->flags2 & MF2_DONTRESPAWN)) + break; + /* FALLTHRU */ default: if (mo->flags & MF_ENEMY || mo->flags & MF_BOSS || mo->type == MT_MINECART) {