From ef19830c31959bb3177c41f12644674bc9f1f7e4 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Thu, 29 Nov 2018 07:49:34 -0500 Subject: [PATCH 1/2] Set indirectitemcooldown for SPB/Shrink drops --- src/p_mobj.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 5bbf6d4cc..561c36e9b 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -7986,11 +7986,15 @@ void P_MobjThinker(mobj_t *mobj) mobj->sprite = SPR_ITEM; mobj->frame = FF_FULLBRIGHT|FF_PAPERSPRITE; break; + case KITEM_SPB: + case KITEM_SHRINK: + indirectitemcooldown = 20*TICRATE; + /* FALLTHRU */ default: mobj->sprite = SPR_ITEM; mobj->frame = FF_FULLBRIGHT|FF_PAPERSPRITE|(mobj->threshold); break; - } + } break; } case MT_ORBINAUT: From 68f465f7a6c5ff5f649ae5cb87a6beb559525adb Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Thu, 29 Nov 2018 07:50:58 -0500 Subject: [PATCH 2/2] Remove in death pits --- src/p_mobj.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 561c36e9b..4724e8c0e 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -7940,7 +7940,12 @@ void P_MobjThinker(mobj_t *mobj) { if (mobj->flags & MF_NOCLIPTHING) { - if (P_IsObjectOnGround(mobj)) + if (P_CheckDeathPitCollide(mobj)) + { + P_RemoveMobj(mobj); + return; + } + else if (P_IsObjectOnGround(mobj)) { mobj->momx = 1; mobj->momy = 0;