From a333806da4efca654f4bf5a0e97338d620b6cbc0 Mon Sep 17 00:00:00 2001
From: Antonio Martinez <aj@worldsbe.st>
Date: Tue, 27 May 2025 21:27:55 -0400
Subject: [PATCH] Fix 4P accessibility icons (close enough)

---
 src/k_hud.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/k_hud.cpp b/src/k_hud.cpp
index 56875b8d7..c134279fa 100644
--- a/src/k_hud.cpp
+++ b/src/k_hud.cpp
@@ -3718,6 +3718,11 @@ static void K_drawKartTeamScores(void)
 	*/
 }
 
+static boolean K_DrawingLaps()
+{
+	return (numlaps != 1 && !K_InRaceDuel() && (UINT16)stplyr->exp != UINT16_MAX);
+}
+
 static boolean K_drawKartLaps(void)
 {
 	INT32 splitflags = V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_SPLITSCREEN;
@@ -4157,7 +4162,16 @@ static void K_drawKartAccessibilityIcons(boolean gametypeinfoshown, INT32 fx)
     }
     else
     {
-        fx = LAPS_X+44;
+        fx = LAPS_X + 33;
+
+		if ((gametyperules & (GTR_BUMPERS|GTR_CIRCUIT)) == GTR_BUMPERS)
+			fx -= 14;
+
+		if (K_DrawingLaps())
+		{
+			fx += 30;
+		}
+
         fy = LAPS_Y;
         if (R_GetViewNumber() & 1) // If we are not P1 or P3...
         {