From 1b2be7b6c99745198317ab3cedf08f20ea1fca25 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 16 Feb 2023 16:35:52 +0000
Subject: [PATCH] K_CheckBumpers, K_HandleBumperChanges: Make 2P behaviour in
 battle capsules mode function

- Only exit Capsules/Versus round if number of players with no bumpers is equal to number of players in game.
- Apply Eliminated flags in relevant context, to prevent griefing.
---
 src/k_battle.c | 29 ++++++++---------------------
 src/k_kart.c   |  4 ++--
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/src/k_battle.c b/src/k_battle.c
index 765df4966..5cc3794fe 100644
--- a/src/k_battle.c
+++ b/src/k_battle.c
@@ -17,6 +17,7 @@
 #include "m_random.h"
 #include "r_sky.h" // skyflatnum
 #include "k_grandprix.h" // K_CanChangeRules
+#include "k_boss.h" // bossinfo.valid
 #include "p_spec.h"
 #include "k_objects.h"
 
@@ -92,7 +93,7 @@ void K_CheckBumpers(void)
 	UINT8 numingame = 0;
 	SINT8 winnernum = -1;
 	UINT32 winnerscoreadd = 0, maxroundscore = 0;
-	boolean nobumpers = false;
+	UINT8 nobumpers = 0;
 
 	if (!(gametyperules & GTR_BUMPERS))
 		return;
@@ -118,7 +119,7 @@ void K_CheckBumpers(void)
 
 		if (players[i].bumpers <= 0) // if you don't have any bumpers, you're probably not a winner
 		{
-			nobumpers = true;
+			nobumpers++;
 			continue;
 		}
 		else if (winnernum != -1) // TWO winners? that's dumb :V
@@ -128,9 +129,9 @@ void K_CheckBumpers(void)
 		winnerscoreadd -= players[i].roundscore;
 	}
 
-	if (K_CanChangeRules(true) == false)
+	if (battlecapsules || bossinfo.valid)
 	{
-		if (nobumpers)
+		if (nobumpers > 0 && nobumpers >= numingame)
 		{
 			for (i = 0; i < MAXPLAYERS; i++)
 			{
@@ -144,29 +145,15 @@ void K_CheckBumpers(void)
 		}
 		return;
 	}
-	else if (numingame <= 1)
+
+	if (numingame <= 1)
 	{
-		if ((gametyperules & GTR_CAPSULES) && !battlecapsules)
+		if ((gametyperules & GTR_CAPSULES) && (K_CanChangeRules(true) == true))
 		{
 			// Reset map to turn on battle capsules
 			if (server)
 				D_MapChange(gamemap, gametype, encoremode, true, 0, false, false);
 		}
-		else
-		{
-			if (nobumpers)
-			{
-				for (i = 0; i < MAXPLAYERS; i++)
-				{
-					if (!playeringame[i])
-						continue;
-					if (players[i].spectator)
-						continue;
-					players[i].pflags |= PF_NOCONTEST;
-					P_DoPlayerExit(&players[i]);
-				}
-			}
-		}
 
 		return;
 	}
diff --git a/src/k_kart.c b/src/k_kart.c
index 081b1b124..5705fa339 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -4192,9 +4192,9 @@ void K_HandleBumperChanges(player_t *player, UINT8 prevBumpers)
 
 		player->karmadelay = comebacktime;
 
-		if (gametyperules & GTR_BOSS)
+		if (battlecapsules || bossinfo.valid)
 		{
-			P_DoTimeOver(player);
+			player->pflags |= (PF_NOCONTEST|PF_ELIMINATED);
 		}
 		else if (netgame)
 		{