From fc3a0683ba1f8c3932c0d6a7c514574032b73538 Mon Sep 17 00:00:00 2001 From: toaster Date: Fri, 8 Mar 2024 00:28:19 +0000 Subject: [PATCH] Got_Mapcmd: Don't promote GTR_BOSS|GTR_SPECIAL to GPEVENT_SPECIAL unless the roundqueue size is 0 The original purpose was to make using the map command allow for multiple tries, ala standard console testing, but the condition was way too permissive and was promoting all esoteric map overrides to undue importance for the end of the Cup's evaluation. --- src/d_netcmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 2e2a1bc9a..362ef6e45 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -2843,7 +2843,7 @@ static void Got_Mapcmd(const UINT8 **cp, INT32 playernum) && mapnumber == gamemap); if (pforcespecialstage // Forced. || (caughtretry && grandprixinfo.eventmode == GPEVENT_SPECIAL) // Catch retries of forced. - || (gametyperules & (GTR_BOSS|GTR_CATCHER))) // Conventional rules. + || (roundqueue.size == 0 && (gametyperules & (GTR_BOSS|GTR_CATCHER)))) // Force convention for the (queue)map command. { grandprixinfo.eventmode = GPEVENT_SPECIAL;