X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fsv_cmd.qc;h=5ff2d3472ae22ebbf2d3d898e0ecbd5f4ae4c910;hb=19794b31e782cca0f5a0d916bc5fd4dc6156eeaf;hp=e8fc1b13f1bbd5b5e897060ebd402ae5eec457da;hpb=797bf448a96c0c13d783c7c919bb2caf6fa16707;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index e8fc1b13f1..5ff2d3472a 100644
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -1274,50 +1274,61 @@ void GameCommand_setbots(int request, int argc)
 	}
 }
 
+void shuffleteams()
+{
+	if (!teamplay)
+	{
+		LOG_INFO("Can't shuffle teams when currently not playing a team game.");
+		return;
+	}
+
+	FOREACH_CLIENT(IS_PLAYER(it) || it.caplayer, {
+		if (Player_HasRealForcedTeam(it)) {
+			// we could theoretically assign forced players to their teams
+			// and shuffle the rest to fill the empty spots but in practise
+			// either all players or none are gonna have forced teams
+			LOG_INFO("Can't shuffle teams because at least one player has a forced team.");
+			return;
+		}
+	});
+
+	int number_of_teams = 0;
+	entity balance = TeamBalance_CheckAllowedTeams(NULL);
+	for (int i = 1; i <= NUM_TEAMS; ++i)
+	{
+		if (TeamBalance_IsTeamAllowed(balance, i))
+		{
+			number_of_teams = max(i, number_of_teams);
+		}
+	}
+	TeamBalance_Destroy(balance);
+
+	int team_index = 0;
+	FOREACH_CLIENT_RANDOM(IS_PLAYER(it) || it.caplayer, {
+		int target_team_index = team_index + 1;
+		if (Entity_GetTeamIndex(it) != target_team_index)
+		{
+			MoveToTeam(it, target_team_index, 6);
+		}
+		team_index = (team_index + 1) % number_of_teams;
+	});
+
+	bprint("Successfully shuffled the players around randomly.\n");
+}
+
 void GameCommand_shuffleteams(int request)
 {
 	switch (request)
 	{
 		case CMD_REQUEST_COMMAND:
 		{
-			if (!teamplay)
+			if (shuffleteams_on_reset_map)
 			{
-				LOG_INFO("Can't shuffle teams when currently not playing a team game.");
-				return;
+				bprint("Players will be shuffled when this round is over.\n");
+				shuffleteams_on_reset_map = true;
 			}
-
-			FOREACH_CLIENT(IS_PLAYER(it) || it.caplayer, {
-				if (Player_HasRealForcedTeam(it)) {
-					// we could theoretically assign forced players to their teams
-					// and shuffle the rest to fill the empty spots but in practise
-					// either all players or none are gonna have forced teams
-					LOG_INFO("Can't shuffle teams because at least one player has a forced team.");
-					return;
-				}
-			});
-
-			int number_of_teams = 0;
-			entity balance = TeamBalance_CheckAllowedTeams(NULL);
-			for (int i = 1; i <= NUM_TEAMS; ++i)
-			{
-				if (TeamBalance_IsTeamAllowed(balance, i))
-				{
-					number_of_teams = max(i, number_of_teams);
-				}
-			}
-			TeamBalance_Destroy(balance);
-
-			int team_index = 0;
-			FOREACH_CLIENT_RANDOM(IS_PLAYER(it) || it.caplayer, {
-				int target_team_index = team_index + 1;
-				if (Entity_GetTeamIndex(it) != target_team_index)
-				{
-					MoveToTeam(it, target_team_index, 6);
-				}
-				team_index = (team_index + 1) % number_of_teams;
-			});
-
-			bprint("Successfully shuffled the players around randomly.\n");
+			else
+				shuffleteams();
 			return;
 		}