From ff0551690177d91bb681e1745c1d2e707278f4ab Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 15 Apr 2024 14:52:16 +0100 Subject: [PATCH 1/3] Don't show Super Emerald related condition text if you haven't unlocked the second row of cups yet --- src/m_cond.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/m_cond.c b/src/m_cond.c index b8ef09890..a3733f899 100644 --- a/src/m_cond.c +++ b/src/m_cond.c @@ -2421,6 +2421,8 @@ static const char *M_GetConditionString(condition_t *cn) if (cn->type == UC_ALLCHAOS) chaostext = "7 Chaos"; + else if (M_CupSecondRowLocked() == true) + return NULL; else if (cn->type == UC_ALLSUPER) chaostext = "7 Super"; else From 4c9d1b7425b4a7a9659b1b87f86642e8206eff12 Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 15 Apr 2024 14:53:14 +0100 Subject: [PATCH 2/3] Tab rankings: Add behaviour for Round Star - show ??? instead of round number --- src/hu_stuff.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 643c1828a..52659ba48 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -2426,7 +2426,15 @@ static void HU_DrawRankings(void) V_DrawString(4, 188, hilicol|V_SNAPTOBOTTOM|V_SNAPTOLEFT, gametypes[gametype]->name); // Left hand side - if (grandprixinfo.gp == true && grandprixinfo.eventmode != GPEVENT_NONE) + const boolean roundqueueinaction = (roundqueue.size > 0 && roundqueue.position > 0); + + 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; V_DrawCenteredString(64, 8, 0, "ROUND"); @@ -2441,7 +2449,7 @@ static void HU_DrawRankings(void) } V_DrawCenteredString(64, 16, hilicol, roundstr); } - else if (roundqueue.size > 0) + else if (roundqueueinaction) { V_DrawCenteredString(64, 8, 0, "ROUND"); V_DrawCenteredString(64, 16, hilicol, va("%d", roundqueue.roundnum)); From 4132e04dcf149c5e129b72bf6a734513d052eb3e Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 15 Apr 2024 15:40:13 +0100 Subject: [PATCH 3/3] More airtight roundqueue check --- src/hu_stuff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 52659ba48..b9b40385f 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -2426,7 +2426,7 @@ static void HU_DrawRankings(void) V_DrawString(4, 188, hilicol|V_SNAPTOBOTTOM|V_SNAPTOLEFT, gametypes[gametype]->name); // Left hand side - const boolean roundqueueinaction = (roundqueue.size > 0 && roundqueue.position > 0); + const boolean roundqueueinaction = (roundqueue.position > 0 && roundqueue.position <= roundqueue.size); if (roundqueueinaction && roundqueue.entries[roundqueue.position-1].overridden == true)