Fix few things that broke when merging with Saturn-Next

This commit is contained in:
indev committed 2024-03-17 16:14:14 +03:00
1 parent bf90b13a4f
commit 86e9b52107
3 files changed
+5 -5

No files matched your search

+1 -1
View File
@@ -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] = "";
+2 -2
View File
@@ -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);
}
+2 -2
View File
@@ -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--;
}