From 1dde02b85a531eef76504494c1277bd83106ca9c Mon Sep 17 00:00:00 2001
From: minenice55 <star.elementa@gmail.com>
Date: Sat, 6 Dec 2025 17:03:39 -0500
Subject: [PATCH] make K_SetItemOut more general

---
 src/k_items.c | 28 ++++++++++++++++++++--------
 src/k_items.h |  3 +++
 src/k_kart.c  | 13 -------------
 src/k_kart.h  |  3 ---
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/k_items.c b/src/k_items.c
index eeadc7a73..981944d81 100644
--- a/src/k_items.c
+++ b/src/k_items.c
@@ -335,6 +335,19 @@ static boolean K_DontDoubleMyItems(kartitemtype_e type, UINT8 amount)
 	    || type >= KITEM_FIRSTFREESLOT; // TODO: excludes custom items for now
 }
 
+void K_SetItemOut(player_t *player, kartitemtype_e itemtype, itemflags_t flags)
+{
+	player->itemflags |= flags;
+	player->equippeditem = itemtype;
+}
+
+void K_UnsetItemOut(player_t *player)
+{
+	player->itemflags &= ~(IF_ITEMOUT|IF_EGGMANOUT|IF_HOLDREADY);
+	player->bananadrag = 0;
+	player->equippeditem = KITEM_NONE;
+}
+
 static sfxenum_t resultfx[] = {
 	[KITEMBLINK_NORMAL] = sfx_itrolf,
 	[KITEMBLINK_MASHED] = sfx_itrolm,
@@ -1937,7 +1950,7 @@ void K_PlayerItemThink(player_t *player, boolean onground)
 
 			player->rocketsneakertimer = (itemtime*3);
 			player->itemamount--;
-			player->equippeditem = KITEM_ROCKETSNEAKER;
+			K_SetItemOut(player, KITEM_ROCKETSNEAKER, 0);
 			K_UpdateHnextList(player, true);
 
 			for (moloop = 0; moloop < 2; moloop++)
@@ -1974,7 +1987,7 @@ void K_PlayerItemThink(player_t *player, boolean onground)
 			mobj_t *prev = player->mo;
 
 			//K_PlayAttackTaunt(player->mo);
-			K_SetItemOut(player, KITEM_BANANA);
+			K_SetItemOut(player, KITEM_BANANA, IF_ITEMOUT);
 			S_StartSound(player->mo, sfx_s254);
 
 			for (moloop = 0; moloop < player->itemamount; moloop++)
@@ -2014,8 +2027,7 @@ void K_PlayerItemThink(player_t *player, boolean onground)
 		{
 			mobj_t *mo;
 			player->itemamount--;
-			player->itemflags |= IF_EGGMANOUT;
-			player->equippeditem = KITEM_EGGMAN;
+			K_SetItemOut(player, KITEM_EGGMAN, IF_EGGMANOUT);
 			S_StartSound(player->mo, sfx_s254);
 			mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_EGGMANITEM_SHIELD);
 			if (mo)
@@ -2040,7 +2052,7 @@ void K_PlayerItemThink(player_t *player, boolean onground)
 			mobj_t *prev = player->mo;
 
 			//K_PlayAttackTaunt(player->mo);
-			K_SetItemOut(player, KITEM_ORBINAUT);
+			K_SetItemOut(player, KITEM_ORBINAUT, IF_ITEMOUT);
 			S_StartSound(player->mo, sfx_s3k3a);
 
 			for (moloop = 0; moloop < player->itemamount; moloop++)
@@ -2083,7 +2095,7 @@ void K_PlayerItemThink(player_t *player, boolean onground)
 			mobj_t *prev = player->mo;
 
 			//K_PlayAttackTaunt(player->mo);
-			K_SetItemOut(player, KITEM_JAWZ);
+			K_SetItemOut(player, KITEM_JAWZ, IF_ITEMOUT);
 			S_StartSound(player->mo, sfx_s3k3a);
 
 			for (moloop = 0; moloop < player->itemamount; moloop++)
@@ -2123,7 +2135,7 @@ void K_PlayerItemThink(player_t *player, boolean onground)
 		if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
 		{
 			mobj_t *mo;
-			K_SetItemOut(player, KITEM_MINE);
+			K_SetItemOut(player, KITEM_MINE, IF_ITEMOUT);
 			S_StartSound(player->mo, sfx_s254);
 			mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SSMINE_SHIELD);
 			if (mo)
@@ -2374,7 +2386,7 @@ void K_PlayerItemThink(player_t *player, boolean onground)
 		if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
 		{
 			mobj_t *mo;
-			K_SetItemOut(player, KITEM_KITCHENSINK);
+			K_SetItemOut(player, KITEM_KITCHENSINK, IF_ITEMOUT);
 			S_StartSound(player->mo, sfx_s254);
 			mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SINK_SHIELD);
 			if (mo)
diff --git a/src/k_items.h b/src/k_items.h
index d0af9b0f4..c82bb7807 100644
--- a/src/k_items.h
+++ b/src/k_items.h
@@ -187,6 +187,9 @@ kartitemequip_e K_GetItemEquipStyle(kartitemtype_e mobjtype);
 UINT8 K_GetItemNumberDisplayMin(kartitemtype_e type, boolean tiny);
 patch_t *K_GetCachedItemPatch(kartitemtype_e type, boolean tiny, UINT8 amount);
 
+void K_SetItemOut(player_t *player, kartitemtype_e itemtype, itemflags_t flags);
+void K_UnsetItemOut(player_t *player);
+
 void K_AwardPlayerItem(player_t *player, kartitemtype_e type, UINT8 amount, kartitemblink_e blink);
 void K_UpdateMobjItemOverlay(mobj_t *part, kartitemtype_e itemType, UINT8 itemCount);
 void K_UpdateItemCooldown(void);
diff --git a/src/k_kart.c b/src/k_kart.c
index 795448e98..7e583bad9 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -10201,19 +10201,6 @@ INT32 K_GetShieldFromItem(INT32 item)
 	}
 }
 
-void K_SetItemOut(player_t *player, kartitemtype_e itemtype)
-{
-	player->itemflags |= IF_ITEMOUT;
-	player->equippeditem = itemtype;
-}
-
-void K_UnsetItemOut(player_t *player)
-{
-	player->itemflags &= ~(IF_ITEMOUT|IF_HOLDREADY);
-	player->bananadrag = 0;
-	player->equippeditem = KITEM_NONE;
-}
-
 static boolean K_InvincibilitySlotHogging(player_t *player)
 {
 	if (!K_IsKartItemAlternate(KITEM_INVINCIBILITY))
diff --git a/src/k_kart.h b/src/k_kart.h
index 4fda5dd7a..032e19145 100644
--- a/src/k_kart.h
+++ b/src/k_kart.h
@@ -341,9 +341,6 @@ void K_PlayPowerGloatSound(mobj_t *source);
 INT32 K_GetShieldFromPlayer(const player_t *player);
 INT32 K_GetShieldFromItem(INT32 item);
 
-void K_SetItemOut(player_t *player, kartitemtype_e itemtype);
-void K_UnsetItemOut(player_t *player);
-
 boolean K_SafeRespawnPosition(mobj_t * mo);
 
 boolean K_RingsActive(void);