X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fteamplay.qc;h=d6432d698658f270e9a60764d20f1b720c2cd3d7;hp=239fb69f0ca8e0e4b20b1da78d8e44897b4e6e5b;hb=e1081ae863928d7ac697d89456b67288d33972b7;hpb=7e537e254c2920bb6bc56e655a5c05c67f95240e

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 239fb69f0..d6432d698 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -1,6 +1,7 @@
 #include "teamplay.qh"
 
 #include "client.qh"
+#include <server/gamelog.qh>
 #include "race.qh"
 #include "scores.qh"
 #include "scores_rules.qh"
@@ -181,7 +182,7 @@ bool Player_SetTeamIndex(entity player, int index)
 		{
 			// This is important when players join the game and one of their
 			// color matches the team color while other doesn't. For example
-			// [BOT]Lion.
+			// [BOT]Lion: color 0 4.
 			SetPlayerColors(player, new_team - 1);
 		}
 		return true;
@@ -227,10 +228,6 @@ bool SetPlayerTeam(entity player, int team_index, int type)
 				Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_QUIT_SPECTATE,
 					player.netname);
 			}
-			else
-			{
-				CS(player).just_joined = false;
-			}
 		}
 		KillPlayerForTeamChange(player);
 		if (!IS_BOT_CLIENT(player))
@@ -238,6 +235,11 @@ bool SetPlayerTeam(entity player, int team_index, int type)
 			TeamBalance_AutoBalanceBots();
 		}
 	}
+	else if (team_index == -1)
+	{
+		if (!CS(player).just_joined && player.frags != FRAGS_SPECTATOR)
+			Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_QUIT_SPECTATE, player.netname);
+	}
 	return true;
 }
 
@@ -463,8 +465,9 @@ entity TeamBalance_CheckAllowedTeams(entity for_whom)
 		team_ent.m_num_bots = 0;
 	}
 	setthink(balance, TeamBalance_Destroy);
-	
-	int teams_mask = 0;	
+	balance.nextthink = time;
+
+	int teams_mask = 0;
 	string teament_name = string_null;
 	bool mutator_returnvalue = MUTATOR_CALLHOOK(TeamBalance_CheckAllowedTeams,
 		teams_mask, teament_name, for_whom);
@@ -495,8 +498,7 @@ entity TeamBalance_CheckAllowedTeams(entity for_whom)
 	}
 
 	// TODO: Balance quantity of bots across > 2 teams when bot_vs_human is set (and remove next line)
-	if (AvailableTeams() == 2)
-	if (autocvar_bot_vs_human && for_whom)
+	if (autocvar_bot_vs_human && AvailableTeams() == 2 && for_whom)
 	{
 		if (autocvar_bot_vs_human > 0)
 		{
@@ -864,12 +866,10 @@ int TeamBalance_CompareTeams(entity balance, int team_index_a, int team_index_b,
 
 void TeamBalance_AutoBalanceBots()
 {
-	if (!autocvar_g_balance_teams ||
-		!autocvar_g_balance_teams_prevent_imbalance)
-	{
-		return;
-	}
-	//PrintToChatAll("TeamBalance_AutoBalanceBots");
+	// checks disabled because we always want auto-balanced bots
+	//if (!(autocvar_g_balance_teams && autocvar_g_balance_teams_prevent_imbalance))
+	//	return;
+
 	entity balance = TeamBalance_CheckAllowedTeams(NULL);
 	TeamBalance_GetTeamCounts(balance, NULL);
 	int smallest_team_index = 0;
@@ -1013,7 +1013,7 @@ void LogTeamChange(float player_id, float team_number, int type)
 	{
 		return;
 	}
-	GameLogEcho(sprintf(":team:%f:%f:%f", player_id, team_number, type));
+	GameLogEcho(sprintf(":team:%d:%d:%d", player_id, team_number, type));
 }
 
 void KillPlayerForTeamChange(entity player)