thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove the last few instances of gametype-specific colorisation

Browse source
This commit is contained in:
toaster 2022-12-31 21:38:52 +00:00
parent a2c5ff6ac8
commit 05241341b8
3 changed files with 3 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/g_game.c
View file

@ -3298,26 +3298,6 @@ INT16 G_SometimesGetDifferentGametype(void)
return (gametype|encoremodifier); return (gametype|encoremodifier);
} }
//
// G_GetGametypeColor
//
// Pretty and consistent ^u^
// See also M_GetGametypeColor (if that still exists).
//
UINT8 G_GetGametypeColor(INT16 gt)
{
if (modeattacking) // == ATTACKING_RECORD
return orangemap[0];
if (gt == GT_BATTLE)
return redmap[0];
if (gt == GT_RACE)
return skymap[0];
return 255; // FALLBACK
}
/** Get the typeoflevel flag needed to indicate support of a gametype. /** Get the typeoflevel flag needed to indicate support of a gametype.
* \param gametype The gametype for which support is desired. * \param gametype The gametype for which support is desired.
* \return The typeoflevel flag to check for that gametype. * \return The typeoflevel flag to check for that gametype.

1
src/g_game.h
View file

@ -190,7 +190,6 @@ boolean G_GametypeHasTeams(void);
boolean G_GametypeHasSpectators(void); boolean G_GametypeHasSpectators(void);
#define VOTEMODIFIER_ENCORE 0x80 #define VOTEMODIFIER_ENCORE 0x80
INT16 G_SometimesGetDifferentGametype(void); INT16 G_SometimesGetDifferentGametype(void);
UINT8 G_GetGametypeColor(INT16 gt);
void G_ExitLevel(void); void G_ExitLevel(void);
void G_NextLevel(void); void G_NextLevel(void);
void G_Continue(void); void G_Continue(void);

10
src/y_inter.c
View file

@ -1209,12 +1209,8 @@ void Y_VoteDrawer(void)
if (timer) if (timer)
{ {
INT32 hilicol, tickdown = (timer+1)/TICRATE; INT32 tickdown = (timer+1)/TICRATE;
if (gametype == GT_RACE) V_DrawCenteredString(BASEVIDWIDTH/2, 188, V_YELLOWMAP,
hilicol = V_SKYMAP;
else //if (gametype == GT_BATTLE)
hilicol = V_REDMAP;
V_DrawCenteredString(BASEVIDWIDTH/2, 188, hilicol,
va("Vote ends in %d", tickdown)); va("Vote ends in %d", tickdown));
} }
} }
@ -1554,7 +1550,7 @@ void Y_StartVote(void)
levelinfo[i].str[sizeof levelinfo[i].str - 1] = '\0'; levelinfo[i].str[sizeof levelinfo[i].str - 1] = '\0';
// set up the gtc and gts // set up the gtc and gts
levelinfo[i].gtc = G_GetGametypeColor(votelevels[i][1]); levelinfo[i].gtc = 255; // TODO rewrite vote screen
if (i == 2 && votelevels[i][1] != votelevels[0][1]) if (i == 2 && votelevels[i][1] != votelevels[0][1])
levelinfo[i].gts = gametypes[votelevels[i][1]]->name; levelinfo[i].gts = gametypes[votelevels[i][1]]->name;
else else