diff --git a/src/d_main.cpp b/src/d_main.cpp index 283b828a9..03f02ac2e 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -1661,6 +1661,8 @@ void D_SRB2Main(void) M_InitPlayerSetupColors(); + K_ReloadHUDColorCvar(); + // Do it before P_InitMapData because PNG patch // conversion sometimes needs the palette V_ReloadPalette(); diff --git a/src/k_hud.c b/src/k_hud.c index 43348ef54..93129fada 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -2645,7 +2645,8 @@ static void K_drawKartStatsnLives(void) // Lives if (LUA_HudEnabled(hud_lives) && uselives) { - UINT8 *colormap = R_GetTranslationColormap(stplyr->skin, K_GetHudColor(), GTC_CACHE); + // We specify stplyr->skincolor since we want it to match the player and not the hud color. + UINT8 *colormap = R_GetTranslationColormap(stplyr->skin, stplyr->skincolor, GTC_CACHE); patch_t *mmappatch = faceprefix[stplyr->skin][FACE_MINIMAP]; V_DrawMappedPatch(fx+21+mmappatch->leftoffset, fy-13+mmappatch->topoffset, V_HUDTRANS|splitflags, mmappatch, colormap); @@ -2674,7 +2675,8 @@ static void K_drawKartStatsnLives(void) } } - UINT8 *colormap = R_GetTranslationColormap(stplyr->skin, K_GetHudColor(), GTC_CACHE); + // We specify stplyr->skincolor since we want it to match the player and not the hud color. + UINT8 *colormap = R_GetTranslationColormap(stplyr->skin, stplyr->skincolor, GTC_CACHE); patch_t *facerank = faceprefix[stplyr->skin][FACE_RANK]; V_DrawMappedPatch(fx+59+offsetx+facerank->leftoffset, fy-16+offsety+facerank->topoffset, V_HUDTRANS|splitflags, facerank, colormap); if (stplyr->lives >= 0 && uselives)