From ddeb438a29e7fe553b3e6191a6331fadf6abeb0c Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 5 Dec 2023 01:06:41 +0100 Subject: [PATCH] clean up colour hud a little --- src/k_kart.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 29948866a..712aba446 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -603,6 +603,11 @@ UINT8 K_GetHudColor(void) return ((stplyr && gamestate == GS_LEVEL) ? stplyr->skincolor : cv_playercolor.value); } +boolean K_UseColorHud(void) +{ + return (cv_colorizedhud.value && clr_hud); +} + //} //{ SRB2kart Net Variables @@ -7706,7 +7711,7 @@ static void K_drawKartItem(void) patch_t *localpatch = kp_nodraw; patch_t *localbg; - if (cv_colorizeditembox.value && cv_colorizedhud.value && clr_hud) + if (cv_colorizeditembox.value && K_UseColorHud()) localbg = ((offset) ? kp_itembgclr[2] : kp_itembgclr[0]); else localbg = ((offset) ? kp_itembg[2] : kp_itembg[0]); @@ -7871,7 +7876,7 @@ static void K_drawKartItem(void) case KITEM_INVINCIBILITY: localpatch = localinv; if (cv_darkitembox.value){ - if (cv_colorizeditembox.value && cv_colorizedhud.value && clr_hud) + if (cv_colorizeditembox.value && K_UseColorHud()) localbg = kp_itembgclr[offset+1]; else localbg = kp_itembg[offset+1]; @@ -7898,7 +7903,7 @@ static void K_drawKartItem(void) case KITEM_SPB: localpatch = kp_selfpropelledbomb[offset]; if (cv_darkitembox.value){ - if (cv_colorizeditembox.value && cv_colorizedhud.value && clr_hud) + if (cv_colorizeditembox.value && K_UseColorHud()) localbg = kp_itembgclr[offset+1]; else localbg = kp_itembg[offset+1]; @@ -7913,7 +7918,7 @@ static void K_drawKartItem(void) case KITEM_THUNDERSHIELD: localpatch = kp_thundershield[offset]; if (cv_darkitembox.value){ - if (cv_colorizeditembox.value && cv_colorizedhud.value && clr_hud) + if (cv_colorizeditembox.value && K_UseColorHud()) localbg = kp_itembgclr[offset+1]; else localbg = kp_itembg[offset+1]; @@ -7986,7 +7991,7 @@ static void K_drawKartItem(void) colmap = R_GetTranslationColormap(colormode, localcolor, GTC_CACHE); - if (cv_colorizeditembox.value && cv_colorizedhud.value && clr_hud) + if (cv_colorizeditembox.value && K_UseColorHud()) { V_DrawMappedPatch(fx, fy, V_HUDTRANS|fflags, localbg,colormap); } @@ -8003,7 +8008,7 @@ static void K_drawKartItem(void) if (stplyr->kartstuff[k_itemamount] >= numberdisplaymin && !stplyr->kartstuff[k_itemroulette]) { //Colourized hud - if (cv_colorizedhud.value && clr_hud) + if (K_UseColorHud()) { V_DrawMappedPatch(fx + (flipamount ? 48 : 0), fy, V_HUDTRANS|fflags|(flipamount ? V_FLIP : 0), kp_itemmulstickerclr[offset],colormap); // flip this graphic for p2 and p4 in split and shift it. } @@ -8074,7 +8079,7 @@ void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT16 emblemmap, UI } } - if (!cv_colorizedhud.value || !clr_hud) + if (!K_UseColorHud()) V_DrawScaledPatch(TX, TY, splitflags, ((mode == 2) ? kp_lapstickerwide : kp_timestickerwide)); else { @@ -8665,7 +8670,7 @@ static void K_drawKartLaps(void) else { - if (!cv_colorizedhud.value || !clr_hud){ + if (!K_UseColorHud()){ if ((cv_numlaps.value > 9) && (big_lap) && (cv_biglaps.value) && (!stplyr->exiting)){ if (stplyr->laps+1 > 9) V_DrawScaledPatch(LAPS_X, LAPS_Y, V_HUDTRANS|splitflags, kp_lapstickerbig2); @@ -8756,7 +8761,7 @@ static void K_drawKartSpeedometer(void) } } else if (cv_newspeedometer.value == 2 && snw_speedo ) { // why bother if we dont? - if (!cv_colorizedhud.value || !clr_hud) + if (!K_UseColorHud()) V_DrawScaledPatch(SPDM_X + 1, SPDM_Y + 4, (V_HUDTRANS|splitflags), (skp_smallsticker)); else { @@ -8895,7 +8900,7 @@ static void K_drawKartBumpersOrKarma(void) if (stplyr->kartstuff[k_bumper] <= 0) { //Colourized hud - if (cv_colorizedhud.value && clr_hud) + if (K_UseColorHud()) { V_DrawMappedPatch(LAPS_X, LAPS_Y, V_HUDTRANS|splitflags, kp_karmastickerclr, colormap); } @@ -8909,7 +8914,7 @@ static void K_drawKartBumpersOrKarma(void) { if (stplyr->kartstuff[k_bumper] > 9 && cv_kartbumpers.value > 9) //Colourized hud - if (cv_colorizedhud.value && clr_hud) + if (K_UseColorHud()) { V_DrawMappedPatch(LAPS_X, LAPS_Y, V_HUDTRANS|splitflags, kp_bumperstickerwideclr, colormap); } @@ -8919,7 +8924,7 @@ static void K_drawKartBumpersOrKarma(void) } else //Colourized hud - if (cv_colorizedhud.value && clr_hud) + if (K_UseColorHud()) { V_DrawMappedPatch(LAPS_X, LAPS_Y, V_HUDTRANS|splitflags, kp_bumperstickerclr, colormap); } @@ -9467,7 +9472,7 @@ static void K_drawBattleFullscreen(void) V_DrawString(x-txoff, ty, 0, va("%d", stplyr->kartstuff[k_comebacktimer]/TICRATE)); else { - if (!cv_colorizedhud.value || !clr_hud) + if (!K_UseColorHud()) V_DrawFixedPatch(x<