From 4de8c7a49f715beb5fc51705df5ba751cbb77b20 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sat, 13 Apr 2024 17:28:45 -0400 Subject: [PATCH 1/2] Fix Prisons reset behavior The elimination behavior was completely preventing the prisons behavior from even being checked. --- src/k_battle.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/k_battle.c b/src/k_battle.c index 5e1b51a01..9a6213a0c 100644 --- a/src/k_battle.c +++ b/src/k_battle.c @@ -179,25 +179,25 @@ void K_CheckBumpers(void) return; } } - else if (eliminated >= numingame - 1) + else if (numingame > 1) { // If every other player is eliminated, the // last player standing wins by default. - if (numingame > 1) + if (eliminated >= numingame - 1) + { K_EndBattleRound(kingofthehill != -1 ? &players[kingofthehill] : NULL); - return; + return; + } } - - if (numingame <= 1) + else { if ((gametyperules & GTR_PRISONS) && !battleprisons && (K_CanChangeRules(true) == true)) { // Reset map to turn on battle prisons if (server) D_MapChange(gamemap, gametype, encoremode, true, 0, false, false); + return; } - - return; } } From fbc80984c6e975dc96162dc380b0f1b846a82126 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sun, 14 Apr 2024 03:32:02 -0400 Subject: [PATCH 2/2] Increase delay on prisons reset --- src/k_battle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/k_battle.c b/src/k_battle.c index 9a6213a0c..daddc4572 100644 --- a/src/k_battle.c +++ b/src/k_battle.c @@ -195,7 +195,7 @@ void K_CheckBumpers(void) { // Reset map to turn on battle prisons if (server) - D_MapChange(gamemap, gametype, encoremode, true, 0, false, false); + D_MapChange(gamemap, gametype, encoremode, true, 1, false, false); return; } }