From 895bd2da15ea3d5a07900b66df9f83c8f33ff8d7 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Wed, 25 Oct 2023 19:57:46 -0400 Subject: [PATCH] Made this a menu option anyway lololololol --- src/k_kart.c | 13 ++++++++----- src/k_kart.h | 1 + src/m_menu.c | 11 ++++++----- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index fa0ebad5b..43cdce5a6 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -63,6 +63,8 @@ consvar_t cv_saltysquish = {"hardcodehopsquish", "On", CV_SAVE, CV_OnOff, NULL, //Colourized HUD consvar_t cv_colorizedhud = {"colorizedhud", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_colorizeditembox = {"colorizeditembox", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + static CV_PossibleValue_t HudColor_cons_t[MAXSKINCOLORS+1]; consvar_t cv_colorizedhudcolor = {"colorizedhudcolor", "Skin Color", CV_SAVE, HudColor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -686,6 +688,7 @@ void K_RegisterKartStuff(void) //Colourized HUD CV_RegisterVar(&cv_colorizedhud); CV_RegisterVar(&cv_colorizedhudcolor); + CV_RegisterVar(&cv_colorizeditembox); CV_RegisterVar(&cv_biglaps); @@ -7535,7 +7538,7 @@ static void K_drawKartItem(void) patch_t *localpatch = kp_nodraw; patch_t *localbg; - if (cv_colorizedhud.value && clr_hud) + if (cv_colorizeditembox.value && cv_colorizedhud.value && clr_hud) localbg = ((offset) ? kp_itembgclr[2] : kp_itembgclr[0]); else localbg = ((offset) ? kp_itembg[2] : kp_itembg[0]); @@ -7699,7 +7702,7 @@ static void K_drawKartItem(void) break; case KITEM_INVINCIBILITY: localpatch = localinv; - if (cv_colorizedhud.value && clr_hud) + if (cv_colorizeditembox.value && cv_colorizedhud.value && clr_hud) localbg = kp_itembgclr[offset+1]; else localbg = kp_itembg[offset+1]; @@ -7724,7 +7727,7 @@ static void K_drawKartItem(void) break; case KITEM_SPB: localpatch = kp_selfpropelledbomb[offset]; - if (cv_colorizedhud.value && clr_hud) + if (cv_colorizeditembox.value && cv_colorizedhud.value && clr_hud) localbg = kp_itembgclr[offset+1]; else localbg = kp_itembg[offset+1]; @@ -7737,7 +7740,7 @@ static void K_drawKartItem(void) break; case KITEM_THUNDERSHIELD: localpatch = kp_thundershield[offset]; - if (cv_colorizedhud.value && clr_hud) + if (cv_colorizeditembox.value && cv_colorizedhud.value && clr_hud) localbg = kp_itembgclr[offset+1]; else localbg = kp_itembg[offset+1]; @@ -7809,7 +7812,7 @@ static void K_drawKartItem(void) colmap = R_GetTranslationColormap(colormode, localcolor, GTC_CACHE); - if (cv_colorizedhud.value && clr_hud) + if (cv_colorizeditembox.value && cv_colorizedhud.value && clr_hud) { V_DrawMappedPatch(fx, fy, V_HUDTRANS|fflags, localbg,colormap); } diff --git a/src/k_kart.h b/src/k_kart.h index c930be1a8..18be989cd 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -22,6 +22,7 @@ UINT8 K_GetHudColor(); void K_RegisterKartStuff(void); extern consvar_t cv_colorizedhud; +extern consvar_t cv_colorizeditembox; extern consvar_t cv_colorizedhudcolor; extern consvar_t cv_biglaps; diff --git a/src/m_menu.c b/src/m_menu.c index 0c0ad0509..42c36c06b 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1721,11 +1721,12 @@ static menuitem_t OP_SaturnMenu[] = {IT_STRING | IT_CVAR, NULL, "Input Display outside of RA", &cv_showinput, 45}, {IT_STRING | IT_CVAR, NULL, "Small Speedometer", &cv_newspeedometer, 55}, {IT_STRING | IT_CVAR, NULL, "Colourized HUD", &cv_colorizedhud, 65}, - {IT_STRING | IT_CVAR, NULL, "Colourized HUD Color", &cv_colorizedhudcolor, 75}, - {IT_STRING | IT_CVAR, NULL, "Show Lap Emblem", &cv_showlapemblem, 85}, - {IT_STRING | IT_CVAR, NULL, "Show Minimap Names", &cv_showminimapnames, 95}, - {IT_STRING | IT_CVAR, NULL, "Small Minimap Players", &cv_minihead, 105}, - {IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 120}, + {IT_STRING | IT_CVAR, NULL, "Colourized Itembox", &cv_colorizeditembox, 75}, + {IT_STRING | IT_CVAR, NULL, "Colourized HUD Color", &cv_colorizedhudcolor, 85}, + {IT_STRING | IT_CVAR, NULL, "Show Lap Emblem", &cv_showlapemblem, 95}, + {IT_STRING | IT_CVAR, NULL, "Show Minimap Names", &cv_showminimapnames, 105}, + {IT_STRING | IT_CVAR, NULL, "Small Minimap Players", &cv_minihead, 115}, + {IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 125}, {IT_SUBMENU|IT_STRING, NULL, "Player distortion...", &OP_PlayerDistortDef, 140}, {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 155},