From 11f428b67ae6f2d7835a6a7c4c73d62555241115 Mon Sep 17 00:00:00 2001
From: "James R." <justsomejames2@gmail.com>
Date: Thu, 7 Sep 2023 00:08:42 -0700
Subject: [PATCH] Add 4P variants for TARGET HUD tracking

---
 src/k_hud.c         | 33 +++++++++++++++++++++++++++------
 src/k_hud.h         |  6 +++---
 src/k_hud_track.cpp | 13 ++++++++-----
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/k_hud.c b/src/k_hud.c
index b245aa91d..4b199dd31 100644
--- a/src/k_hud.c
+++ b/src/k_hud.c
@@ -197,11 +197,11 @@ patch_t *kp_autoroulette;
 
 patch_t *kp_capsuletarget_arrow[2][2];
 patch_t *kp_capsuletarget_icon[2];
-patch_t *kp_capsuletarget_far[2];
+patch_t *kp_capsuletarget_far[2][2];
 patch_t *kp_capsuletarget_far_text[2];
-patch_t *kp_capsuletarget_near[8];
+patch_t *kp_capsuletarget_near[2][8];
 
-patch_t *kp_superflickytarget[4];
+patch_t *kp_superflickytarget[2][4];
 
 patch_t *kp_button_a[2][2];
 patch_t *kp_button_b[2][2];
@@ -758,23 +758,44 @@ void K_LoadKartHUDGraphics(void)
 	for (i = 0; i < 2; i++)
 	{
 		buffer[7] = '0'+i;
-		HU_UpdatePatch(&kp_capsuletarget_far[i], "%s", buffer);
+		HU_UpdatePatch(&kp_capsuletarget_far[0][i], "%s", buffer);
+	}
+
+	sprintf(buffer, "HUDC4PBx");
+	for (i = 0; i < 2; i++)
+	{
+		buffer[7] = '0'+i;
+		HU_UpdatePatch(&kp_capsuletarget_far[1][i], "%s", buffer);
 	}
 
 	sprintf(buffer, "HUDCAPAx");
 	for (i = 0; i < 8; i++)
 	{
 		buffer[7] = '0'+i;
-		HU_UpdatePatch(&kp_capsuletarget_near[i], "%s", buffer);
+		HU_UpdatePatch(&kp_capsuletarget_near[0][i], "%s", buffer);
+	}
+
+	sprintf(buffer, "HUDC4PAx");
+	for (i = 0; i < 8; i++)
+	{
+		buffer[7] = '0'+i;
+		HU_UpdatePatch(&kp_capsuletarget_near[1][i], "%s", buffer);
 	}
 
 	sprintf(buffer, "HUDFLKAx");
 	for (i = 0; i < 4; i++)
 	{
 		buffer[7] = '0'+i;
-		HU_UpdatePatch(&kp_superflickytarget[i], "%s", buffer);
+		HU_UpdatePatch(&kp_superflickytarget[0][i], "%s", buffer);
 	}	
 
+	sprintf(buffer, "H4PFLKAx");
+	for (i = 0; i < 4; i++)
+	{
+		buffer[7] = '0'+i;
+		HU_UpdatePatch(&kp_superflickytarget[1][i], "%s", buffer);
+	}
+
 	K_LoadButtonGraphics(kp_button_a[0], 'A');
 	K_LoadButtonGraphics(kp_button_a[1], 'N');
 	K_LoadButtonGraphics(kp_button_b[0], 'B');
diff --git a/src/k_hud.h b/src/k_hud.h
index d982c851b..de2e788c2 100644
--- a/src/k_hud.h
+++ b/src/k_hud.h
@@ -55,11 +55,11 @@ void K_DrawSticker(INT32 x, INT32 y, INT32 width, INT32 flags, boolean isSmall);
 
 extern patch_t *kp_capsuletarget_arrow[2][2];
 extern patch_t *kp_capsuletarget_icon[2];
-extern patch_t *kp_capsuletarget_far[2];
+extern patch_t *kp_capsuletarget_far[2][2];
 extern patch_t *kp_capsuletarget_far_text[2];
-extern patch_t *kp_capsuletarget_near[8];
+extern patch_t *kp_capsuletarget_near[2][8];
 
-extern patch_t *kp_superflickytarget[4];
+extern patch_t *kp_superflickytarget[2][4];
 
 extern patch_t *kp_autoroulette;
 
diff --git a/src/k_hud_track.cpp b/src/k_hud_track.cpp
index 97c43d9fd..94b628e1d 100644
--- a/src/k_hud_track.cpp
+++ b/src/k_hud_track.cpp
@@ -144,18 +144,21 @@ private:
 		case MT_SUPER_FLICKY:
 			return {
 				{ // Near
-					{4, 2, {kp_superflickytarget}}, // 1P
+					{4, 2, {kp_superflickytarget[0]}}, // 1P
+					{{4, 2, {kp_superflickytarget[1]}}}, // 4P
 				},
 			};
 
 		default:
 			return {
 				{ // Near
-					{8, 2, {kp_capsuletarget_near}}, // 1P
-				},
-				{ // Far
-					{2, 3, {kp_capsuletarget_far, kp_capsuletarget_far_text}}, // 1P
+					{8, 2, {kp_capsuletarget_near[0]}}, // 1P
+					{{8, 2, {kp_capsuletarget_near[1]}}}, // 4P
 				},
+				{{ // Far
+					{2, 3, {kp_capsuletarget_far[0], kp_capsuletarget_far_text}}, // 1P
+					{{2, 3, {kp_capsuletarget_far[1]}}}, // 4P
+				}},
 			};
 		}
 	}