From 91bda83c9243b8bbc82a2cde9756597e462ea22c Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 Feb 2024 22:11:41 +0100 Subject: [PATCH] fix conflict --- src/k_kart.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index acf13afcf..20c72b35a 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -10455,24 +10455,19 @@ void K_drawKartHUD(void) } // Draw the item window - K_drawKartItem(); if (LUA_HudEnabled(hud_item) && !freecam) K_drawKartItem(); if (cv_driftgauge.value && !modeattacking) { -#ifdef HAVE_BLUA - if (LUA_HudEnabled(hud_driftgauge)) -#endif - K_drawDriftGauge(); + if (LUA_HudEnabled(hud_driftgauge)) + K_drawDriftGauge(); } if (cv_nametag.value) { -#ifdef HAVE_BLUA - if (LUA_HudEnabled(hud_nametags)) -#endif - K_drawNameTags(); + if (LUA_HudEnabled(hud_nametags)) + K_drawNameTags(); } // If not splitscreen, draw...