From ec97111d26c64d6433a23b91c8ba7809ebb14691 Mon Sep 17 00:00:00 2001 From: Indev Date: Mon, 13 Nov 2023 21:38:13 +0300 Subject: [PATCH] Make K_GetHudColor use player skincolor instead of color cvar when possible. Also fix compilation warning --- src/k_kart.c | 4 ++-- src/k_kart.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index ea1dff824..c5daf317d 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -592,13 +592,13 @@ UINT8 K_GetKartColorByName(const char *name) return 0; } -UINT8 K_GetHudColor() +UINT8 K_GetHudColor(void) { if (stplyr && players - stplyr != consoleplayer) return stplyr->skincolor; if (cv_colorizedhud.value){ if (cv_colorizedhudcolor.value) return cv_colorizedhudcolor.value; } - return cv_playercolor.value; + return (stplyr ? stplyr->skincolor : cv_playercolor.value); } //} diff --git a/src/k_kart.h b/src/k_kart.h index e5dbad724..86a7b1e45 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -17,7 +17,7 @@ extern const UINT8 KartColor_Opposite[MAXSKINCOLORS*2]; void K_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor); void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color, boolean local); UINT8 K_GetKartColorByName(const char *name); -UINT8 K_GetHudColor(); +UINT8 K_GetHudColor(void); void K_RegisterKartStuff(void);