From ee80e52e5676b017db11d917c7c8b539b23ce413 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Tue, 10 Mar 2026 21:04:35 -0400 Subject: [PATCH] Remove paranoia fallback for hud color Gametypes should always have a color. --- src/hu_stuff.c | 7 +------ src/y_inter.c | 16 ++++------------ 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 312a00537..8bb9737e4 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -2526,12 +2526,7 @@ static void HU_DrawRankings(void) else if (modeattacking) hilicol = V_ORANGEMAP; else - { - if (gametypes[gametype]->color) - hilicol = gametypes[gametype]->color; - else - hilicol = V_YELLOWMAP; - } + hilicol = gametypes[gametype]->color; if (!demo.playback) { diff --git a/src/y_inter.c b/src/y_inter.c index 28dad29b3..f2a9e66a7 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -462,12 +462,7 @@ void Y_IntermissionDrawer(void) else if (modeattacking) hilicol = V_ORANGEMAP; else - { - if (gametypes[gametype]->color) - hilicol = gametypes[gametype]->color; - else - hilicol = V_YELLOWMAP; - } + hilicol = gametypes[gametype]->color; if (rolltic != -1 && intertic > (rolltic - 8) && (intertic < (rolltic + 8))) { @@ -1797,15 +1792,12 @@ void Y_VoteDrawer(void) if (timer) { INT32 hilicol, tickdown = (timer+1)/TICRATE; + if (cons_menuhighlight.value) hilicol = cons_menuhighlight.value; else - { - if (gametypes[gametype]->color) - hilicol = gametypes[gametype]->color; - else - hilicol = V_YELLOWMAP; - } + hilicol = gametypes[gametype]->color; + V_DrawCenteredString(BASEVIDWIDTH/2, 188, hilicol, va("Vote ends in %d", tickdown)); }