Make K_GetHudColor use player skincolor instead of color cvar when possible. Also fix compilation warning
This commit is contained in:
1 parent
6d24d5a44a
commit
ec97111d26
2 files changed
+3
-3
No files matched your search
+2
-2
@@ -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);
|
||||
}
|
||||
|
||||
//}
|
||||
|
||||
+1
-1
@@ -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);
|
||||
|
||||
|
||||
Reference in new issue
Block a user