From 9ce4fcb2b8eb03df77ad8c3b25c4f112bc0861ff Mon Sep 17 00:00:00 2001
From: NepDisk <nepdisk@noreply.codeberg.org>
Date: Fri, 3 Oct 2025 13:48:24 -0400
Subject: [PATCH] Save a loop for battle init

---
 src/k_battle.c | 16 +++-------------
 src/k_battle.h |  2 +-
 src/k_kart.c   |  2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/k_battle.c b/src/k_battle.c
index 86eddeb3f..e37cfee39 100644
--- a/src/k_battle.c
+++ b/src/k_battle.c
@@ -486,27 +486,16 @@ void K_SpawnPlayerBattleBumpers(player_t *p)
 	}
 }
 
-void K_BattleInit(void)
+void K_BattleInit(UINT8 numPlayers)
 {
-	size_t i;
-
 	if ((gametyperules & GTR_ITEMBREAKER) && !itembreaker && !bossinfo.boss)
 	{
 		if (modeattacking != ATTACKING_ITEMBREAK)
 		{
-			UINT8 n = 0;
-
 			if (!cv_kartitembreaker.value)
 				goto afteritembreaker;
 
-			for (i = 0; i < MAXPLAYERS; i++)
-			{
-				if (!playeringame[i] || players[i].spectator)
-					continue;
-				n++;
-			}
-
-			if (n > 1)
+			if (numPlayers > 1)
 				goto afteritembreaker;
 		}
 
@@ -517,6 +506,7 @@ afteritembreaker:
 	if (gametyperules & GTR_BUMPERS)
 	{
 		INT32 maxbumpers = K_StartingBumperCount();
+		UINT8 i;
 
 		for (i = 0; i < MAXPLAYERS; i++)
 		{
diff --git a/src/k_battle.h b/src/k_battle.h
index e38f42060..0ef5b52ef 100644
--- a/src/k_battle.h
+++ b/src/k_battle.h
@@ -21,7 +21,7 @@ void K_CheckBumpers(void);
 UINT8 K_NumEmeralds(player_t *player);
 void K_RunPaperItemSpawners(void);
 void K_SpawnPlayerBattleBumpers(player_t *p);
-void K_BattleInit(void);
+void K_BattleInit(UINT8 numPlayers);
 void K_RespawnBattleBoxes(void);
 
 #ifdef __cplusplus
diff --git a/src/k_kart.c b/src/k_kart.c
index 1f4875f61..42e9f8a10 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -130,7 +130,7 @@ void K_TimerInit(void)
 	}
 
 	// NOW you can try to setup Item Breaker, if there's not enough players for a match
-	K_BattleInit();
+	K_BattleInit(numPlayers);
 
 	timelimitintics = extratimeintics = secretextratime = 0;
 	if ((gametyperules & GTR_TIMELIMIT) && !bossinfo.boss)