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

Merge branch 'hud-final' into 'master'

Browse source 
Hud final

See merge request KartKrew/Kart!2295
This commit is contained in:
toaster 2024-04-15 15:05:26 +00:00
commit ffa8f03187
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/hu_stuff.c
View file

@ -2426,7 +2426,15 @@ static void HU_DrawRankings(void)
V_DrawString(4, 188, hilicol|V_SNAPTOBOTTOM|V_SNAPTOLEFT, gametypes[gametype]->name); V_DrawString(4, 188, hilicol|V_SNAPTOBOTTOM|V_SNAPTOLEFT, gametypes[gametype]->name);
// Left hand side // Left hand side
if (grandprixinfo.gp == true && grandprixinfo.eventmode != GPEVENT_NONE) const boolean roundqueueinaction = (roundqueue.position > 0 && roundqueue.position <= roundqueue.size);
if (roundqueueinaction
&& roundqueue.entries[roundqueue.position-1].overridden == true)
{
V_DrawCenteredString(64, 8, 0, "ROUND");
V_DrawCenteredString(64, 16, hilicol, "???");
}
else if (grandprixinfo.gp == true && grandprixinfo.eventmode != GPEVENT_NONE)
{ {
const char *roundstr = NULL; const char *roundstr = NULL;
V_DrawCenteredString(64, 8, 0, "ROUND"); V_DrawCenteredString(64, 8, 0, "ROUND");
@ -2441,7 +2449,7 @@ static void HU_DrawRankings(void)
} }
V_DrawCenteredString(64, 16, hilicol, roundstr); V_DrawCenteredString(64, 16, hilicol, roundstr);
} }
else if (roundqueue.size > 0) else if (roundqueueinaction)
{ {
V_DrawCenteredString(64, 8, 0, "ROUND"); V_DrawCenteredString(64, 8, 0, "ROUND");
V_DrawCenteredString(64, 16, hilicol, va("%d", roundqueue.roundnum)); V_DrawCenteredString(64, 16, hilicol, va("%d", roundqueue.roundnum));

2
src/m_cond.c
View file

@ -2421,6 +2421,8 @@ static const char *M_GetConditionString(condition_t *cn)
if (cn->type == UC_ALLCHAOS) if (cn->type == UC_ALLCHAOS)
chaostext = "7 Chaos"; chaostext = "7 Chaos";
else if (M_CupSecondRowLocked() == true)
return NULL;
else if (cn->type == UC_ALLSUPER) else if (cn->type == UC_ALLSUPER)
chaostext = "7 Super"; chaostext = "7 Super";
else else