From 58cccedd642f5e7fb13e778a1e14d5d8f89d22f0 Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 27 Jun 2023 00:23:34 -0700 Subject: [PATCH] MT_FLOATINGITEM: use K_UpdateMobjItemOverlay --- src/p_mobj.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 7f596338d..5f1012708 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -7211,29 +7211,12 @@ static boolean P_MobjRegularThink(mobj_t *mobj) } } - switch (mobj->threshold) + if (mobj->threshold == KITEM_SPB || mobj->threshold == KITEM_SHRINK) { - case KITEM_ORBINAUT: - mobj->sprite = SPR_ITMO; - mobj->frame = FF_FULLBRIGHT|FF_PAPERSPRITE|K_GetOrbinautItemFrame(mobj->movecount); - break; - case KITEM_INVINCIBILITY: - mobj->sprite = SPR_ITMI; - mobj->frame = FF_FULLBRIGHT|FF_PAPERSPRITE|K_GetInvincibilityItemFrame(); - break; - case KITEM_SAD: - mobj->sprite = SPR_ITEM; - mobj->frame = FF_FULLBRIGHT|FF_PAPERSPRITE; - break; - case KITEM_SPB: - case KITEM_SHRINK: - K_SetItemCooldown(mobj->threshold, 20*TICRATE); - /* FALLTHRU */ - default: - mobj->sprite = SPR_ITEM; - mobj->frame = FF_FULLBRIGHT|FF_PAPERSPRITE|(mobj->threshold); - break; + K_SetItemCooldown(mobj->threshold, 20*TICRATE); } + + K_UpdateMobjItemOverlay(mobj, mobj->threshold, mobj->movecount); break; } case MT_ITEMCAPSULE: