spectator slots won't be automatically set by default anymore

Author: JSaurusRex

src/engine/shared/config_variables.h

@@ -662,6 +662,7 @@ MACRO_CONFIG_INT(SvKoBo3, sv_ko_bo3, 0, 0, 5, CFGFLAG_SERVER, "Best of X wins (K
 MACRO_CONFIG_INT(SvForcePredictionMargin, sv_force_prediction_margin, 0, 0, 200, CFGFLAG_SERVER, "force players to have a higher prediction margin for more consistant gameplay")
 MACRO_CONFIG_INT(SvKoSQL, sv_ko_sql, 0, 0, 1, CFGFLAG_SERVER, "Save result of cup of the day in database")
 MACRO_CONFIG_INT(SvKoMode, sv_ko_mode, 0, 0, 1, CFGFLAG_SERVER, "Cup of the day Mode: 0 = gores, 1 = race")
+MACRO_CONFIG_INT(SvKoSetSlots, sv_ko_set_slots, 0, 0, 1, CFGFLAG_SERVER, "If slots are automatically set & unset by server")
 
 
 MACRO_CONFIG_STR(SvRoundStatsDiscordWebhooks, sv_round_stats_discord_webhooks, 512, "", CFGFLAG_SERVER, "If set will post score stats there on round end. Is JSON")

src/game/server/ddracecommands.cpp

@@ -114,7 +114,8 @@ void CGameContext::ConKO_Start(IConsole::IResult *pResult, void *pUserData)
 			return;
 		}
 
-		g_Config.m_SvSpectatorSlots = g_Config.m_SvMaxClients - playerCount;
+		if(g_Config.m_SvKoSetSlots)
+			g_Config.m_SvSpectatorSlots = g_Config.m_SvMaxClients - playerCount;
 	}
 
 	for(int i = 0; i < MAX_CLIENTS; i++)

src/game/server/gamemodes/DDRace.cpp

@@ -92,10 +92,13 @@ void CGameControllerDDRace::KO_Start()
 		else
 		{
 			SendWebhook();
-			g_Config.m_SvSpectatorSlots = 0;
+
+			if(g_Config.m_SvKoSetSlots)
+				g_Config.m_SvSpectatorSlots = 0;
 		}
 		GameServer()->ko_game = false;
 		GameServer()->ko_round = 0;
+		GameServer()->ko_player_count = 0;
 		return;
 	}
 
@@ -150,7 +153,9 @@ void CGameControllerDDRace::KO_Start()
 			GameServer()->ko_game = false;
 			GameServer()->ko_round = 0;
 			GameServer()->ko_player_count = 0;
-			g_Config.m_SvSpectatorSlots = 0;
+
+			if(g_Config.m_SvKoSetSlots)
+				g_Config.m_SvSpectatorSlots = 0;
 			SendWebhook();
 			return;
 		}
@@ -505,7 +510,8 @@ void CGameControllerDDRace::HandleCharacterTiles(CCharacter *pChr, int MapIndex)
 					SaveCOTD();
 				else
 				{
-					g_Config.m_SvSpectatorSlots = 0;
+					if(g_Config.m_SvKoSetSlots)
+						g_Config.m_SvSpectatorSlots = 0;
 					SendWebhook();
 				}
 
@@ -635,7 +641,7 @@ void CGameControllerDDRace::Tick()
 	if(players == 0)
 	{
 		//no players so stop the game
-		if(g_Config.m_SvKoBo3)
+		if(g_Config.m_SvKoBo3 && g_Config.m_SvKoSetSlots)
 			g_Config.m_SvSpectatorSlots = 0;
 
 		GameServer()->ko_game = false;