From 86e9b521071b855c1384d3e732840eb2319e9cdb Mon Sep 17 00:00:00 2001 From: Indev Date: Sun, 17 Mar 2024 16:14:14 +0300 Subject: [PATCH] Fix few things that broke when merging with Saturn-Next --- src/d_main.c | 2 +- src/k_kart.c | 4 ++-- src/m_menu.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 007635139..10fdd380c 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -964,7 +964,7 @@ static void D_FindAddonsToAutoload(void) const char *autoloadpath; boolean postload; - INT32 i; + INT32 i, len; boolean hasprefix = false; char wadsToAutoload[256] = ""; diff --git a/src/k_kart.c b/src/k_kart.c index 826f2019a..082520c78 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -608,7 +608,7 @@ UINT8 K_GetKartColorByName(const char *name) return 0; } -static UINT8 K_GetHudColor(void) +UINT8 K_GetHudColor(void) { if (cv_colorizedhud.value){ if (cv_colorizedhudcolor.value) return cv_colorizedhudcolor.value; @@ -617,7 +617,7 @@ static UINT8 K_GetHudColor(void) return ((stplyr && gamestate == GS_LEVEL) ? stplyr->skincolor : cv_playercolor.value); } -static boolean K_UseColorHud(void) +boolean K_UseColorHud(void) { return (cv_colorizedhud.value && clr_hud); } diff --git a/src/m_menu.c b/src/m_menu.c index 866fed22f..ce41ae0f7 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -5125,7 +5125,7 @@ static void M_DrawGenericMenu(void) { if (!(OP_NametagTooltips[itemOn] == NULL)) { - M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_NametagTooltips[itemOn], 30, coolalphatimer); + M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_NametagTooltips[itemOn], coolalphatimer); if (coolalphatimer > 0 && interpTimerHackAllow) coolalphatimer--; } @@ -5135,7 +5135,7 @@ static void M_DrawGenericMenu(void) { if (!(OP_DriftGaugeTooltips[itemOn] == NULL)) { - M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_DriftGaugeTooltips[itemOn], 30, coolalphatimer); + M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_DriftGaugeTooltips[itemOn], coolalphatimer); if (coolalphatimer > 0 && interpTimerHackAllow) coolalphatimer--; }