From ba994c261a1b726e634c86d64d01429d32e1510d Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 3 Mar 2023 02:37:41 -0800 Subject: [PATCH] HERE COMES A NEW CHALLENGER for 3P Fixes DUEL mode still being active if a 3rd player enters before 20 seconds is up. --- src/k_kart.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 368d4cb0c..e8f595399 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -11443,8 +11443,9 @@ void K_CheckSpectateStatus(void) P_SpectatorJoinGame(&players[respawnlist[i]]); } - // Reset the match if you're in an empty server - if (!mapreset && gamestate == GS_LEVEL && leveltime >= starttime && (numingame < 2 && numingame+i >= 2)) // use previous i value + // Reset the match when 2P joins 1P, DUEL mode + // Reset the match when 3P joins 1P and 2P, DUEL mode must be disabled + if (!mapreset && gamestate == GS_LEVEL && leveltime >= starttime && (numingame < 3 && numingame+i >= 2)) // use previous i value { S_ChangeMusicInternal("chalng", false); // COME ON mapreset = 3*TICRATE; // Even though only the server uses this for game logic, set for everyone for HUD