Remove paranoia fallback for hud color
Gametypes should always have a color.
This commit is contained in:
parent
4932bde9b0
commit
ee80e52e56
2 changed files with 5 additions and 18 deletions
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue