From 8f4c710fd6cc4b2f420f3c67251cdc4a141c32d1 Mon Sep 17 00:00:00 2001
From: Anonimus <anonimus.srb2k@gmail.com>
Date: Sun, 9 Nov 2025 00:29:16 -0500
Subject: [PATCH] Make the multi-item ALT indicator use separate patches

Minimize hardcode offsets
---
 src/k_hud.c      | 13 +++++++------
 src/k_hud.h      |  2 +-
 src/lua_hudlib.c |  5 +++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/k_hud.c b/src/k_hud.c
index c34a7ac88..86cc65795 100644
--- a/src/k_hud.c
+++ b/src/k_hud.c
@@ -181,7 +181,7 @@ static patch_t *kp_wantedreticle;
 static patch_t *kp_minimapdot;
 
 static patch_t *kp_itembg[8];
-static patch_t *kp_itemalt[2];
+static patch_t *kp_itemalt[4];
 static patch_t *kp_itemtimer[2];
 static patch_t *kp_itemmulsticker[4];
 static patch_t *kp_itemx;
@@ -529,6 +529,8 @@ void K_LoadKartHUDGraphics(void)
 	HU_UpdatePatch(&kp_itembg[7], "K_ISBCD");
 	HU_UpdatePatch(&kp_itemalt[0], "K_ALTITM");
 	HU_UpdatePatch(&kp_itemalt[1], "K_ALTITS");
+	HU_UpdatePatch(&kp_itemalt[2], "K_ALTIMM");
+	HU_UpdatePatch(&kp_itemalt[3], "K_ALTISM");
 	HU_UpdatePatch(&kp_itemtimer[0], "K_ITIMER");
 	HU_UpdatePatch(&kp_itemtimer[1], "K_ISIMER");
 	HU_UpdatePatch(&kp_itemmulsticker[0], "K_ITMUL");
@@ -742,9 +744,9 @@ patch_t *K_getItemMulPatch(boolean small)
 	return K_UseColorHud() ? kp_itemmulsticker[2+ofs] : kp_itemmulsticker[ofs];
 }
 
-patch_t *K_getItemAltPatch(boolean small)
+patch_t *K_getItemAltPatch(boolean small, boolean multimode)
 {
-	UINT8 ofs = small ? 1 : 0;
+	UINT8 ofs = (small ? 1 : 0) + (multimode ? 2 : 0);
 	return kp_itemalt[ofs];
 }
 
@@ -1393,8 +1395,7 @@ static void K_drawKartItem(void)
 
 		if (isalt)
 		{
-			const INT32 altofs = tiny ? -12 : -25;
-			V_DrawFixedPatch((fx+altofs)<<FRACBITS, fy<<FRACBITS, FRACUNIT, V_HUDTRANS|fflags, K_getItemAltPatch(tiny), colmap);
+			V_DrawFixedPatch(fx<<FRACBITS, fy<<FRACBITS, FRACUNIT, V_HUDTRANS|fflags, K_getItemAltPatch(tiny, true), colmap);
 		}
 
 		if (tiny)
@@ -1414,7 +1415,7 @@ static void K_drawKartItem(void)
 
 		// TODO: Some proper check for if an alt has unique graphics
 		if (isalt)
-			V_DrawFixedPatch(fx<<FRACBITS, rfy, FRACUNIT, fancyflags, K_getItemAltPatch(tiny), colmap);
+			V_DrawFixedPatch(fx<<FRACBITS, rfy, FRACUNIT, fancyflags, K_getItemAltPatch(tiny, false), colmap);
 	}
 
 	//V_ClearClipRect();
diff --git a/src/k_hud.h b/src/k_hud.h
index 40aa4f82f..d9c91dce5 100644
--- a/src/k_hud.h
+++ b/src/k_hud.h
@@ -89,7 +89,7 @@ typedef struct
 
 patch_t *K_getItemBoxPatch(boolean small, boolean dark);
 patch_t *K_getItemMulPatch(boolean small);
-patch_t *K_getItemAltPatch(boolean small);
+patch_t *K_getItemAltPatch(boolean small, boolean multimode);
 void K_getItemBoxDrawinfo(drawinfo_t *out);
 void K_getLapsDrawinfo(drawinfo_t *out);
 void K_getRingsDrawinfo(drawinfo_t *out);
diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c
index 082f515bd..fa0eee598 100644
--- a/src/lua_hudlib.c
+++ b/src/lua_hudlib.c
@@ -1188,7 +1188,7 @@ static int libd_getColorHudPatch(lua_State *L)
 	enum hudpatch option = luaL_checkoption(L, 1, NULL, hud_patch_options);
 	patch_t *patch;
 	UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
-	boolean small, dark;
+	boolean small, dark, multi;
 
 	switch (option) {
 		case hudpatch_item:
@@ -1204,7 +1204,8 @@ static int libd_getColorHudPatch(lua_State *L)
 			break;
 		case hudpatch_itemalt:
 			small = lua_optboolean(L, 2);
-			patch = K_getItemAltPatch(small);
+			multi = lua_optboolean(L, 3);
+			patch = K_getItemAltPatch(small, multi);
 			break;
 		default:
 			return 0; // you shouldn't be here