diff --git a/src/k_hud.c b/src/k_hud.c index eac4f291d..1aa0c97f8 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -2202,7 +2202,7 @@ static void K_drawKartLapsAndRings(void) static void K_drawKartAccessibilityIcons(INT32 fx) { - INT32 fy = LAPS_Y; + INT32 fy = LAPS_Y-25; UINT8 col = 0, i, wid, fil; INT32 splitflags = V_SNAPTOLEFT|V_SNAPTOBOTTOM|V_SPLITSCREEN; //INT32 step = 1; -- if there's ever more than one accessibility icon @@ -2211,13 +2211,12 @@ static void K_drawKartAccessibilityIcons(INT32 fx) if (r_splitscreen < 2) // adjust to speedometer height { - fy -= 25; if (gametype == GT_BATTLE) fy -= 4; } else { - fx += 44; + fy += 4; if (!(stplyr == &players[displayplayers[0]] || stplyr == &players[displayplayers[2]])) // If we are not P1 or P3... { splitflags ^= (V_SNAPTOLEFT|V_SNAPTORIGHT); @@ -2308,7 +2307,7 @@ static void K_drawKartSpeedometer(void) V_DrawScaledPatch(LAPS_X+19, LAPS_Y-25 + battleoffset, V_HUDTRANS|V_SLIDEIN|splitflags, kp_facenum[numbers[2]]); V_DrawScaledPatch(LAPS_X+29, LAPS_Y-25 + battleoffset, V_HUDTRANS|V_SLIDEIN|splitflags, kp_speedometerlabel[labeln]); - K_drawKartAccessibilityIcons(57); + K_drawKartAccessibilityIcons(56); } static void K_drawBlueSphereMeter(void) @@ -4234,16 +4233,6 @@ void K_drawKartHUD(void) if (!stplyr->spectator && !demo.freecam) // Bottom of the screen elements, don't need in spectate mode { - // Draw the speedometer - if (cv_kartspeedometer.value && !r_splitscreen && (LUA_HudEnabled(hud_speedometer))) - { - K_drawKartSpeedometer(); - } - else - { - K_drawKartAccessibilityIcons(0); - } - if (demo.title) // Draw title logo instead in demo.titles { INT32 x = BASEVIDWIDTH - 32, y = 128, offs; @@ -4294,6 +4283,16 @@ void K_drawKartHUD(void) K_drawKartBumpersOrKarma(); } + // Draw the speedometer and/or accessibility icons + if (cv_kartspeedometer.value && !r_splitscreen && (LUA_HudEnabled(hud_speedometer))) + { + K_drawKartSpeedometer(); + } + else + { + K_drawKartAccessibilityIcons((r_splitscreen > 1) ? 0 : 8); + } + if (gametyperules & GTR_SPHERES) { K_drawBlueSphereMeter();