From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 6 Jul 2012 09:50:38 +0000 (+0200)
Subject: simplify g_balance_teams_prevent_imbalance (now it only allows changing to the "auto... 
X-Git-Tag: xonotic-v0.7.0~312^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=69e8577de56fce9814e82d544877291b5de107bf;p=xonotic%2Fxonotic-data.pk3dir.git

simplify g_balance_teams_prevent_imbalance (now it only allows changing to the "auto" team)
---

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index db01a8f58..929ab95bb 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -863,60 +863,12 @@ void SV_ChangeTeam(float _color)
 
 	if(autocvar_g_balance_teams_prevent_imbalance)
 	{
-		// only allow changing to a smaller or equal size team
-
-		// find out what teams are available
-		//CheckAllowedTeams();
-		// count how many players on each team
-		GetTeamCounts(world);
-
-		// get desired team
-		if(dteam == 1 && c1 >= 0)//dcolor == COLOR_TEAM1 - 1)
-		{
-			dcount = c1;
-			dbotcount = cb1;
-		}
-		else if(dteam == 2 && c2 >= 0)//dcolor == COLOR_TEAM2 - 1)
-		{
-			dcount = c2;
-			dbotcount = cb2;
-		}
-		else if(dteam == 3 && c3 >= 0)//dcolor == COLOR_TEAM3 - 1)
-		{
-			dcount = c3;
-			dbotcount = cb3;
-		}
-		else if(dteam == 4 && c4 >= 0)//dcolor == COLOR_TEAM4 - 1)
+		t = FindSmallestTeam(self, TRUE);
+		if(dteam != t)
 		{
-			dcount = c4;
-			dbotcount = cb4;
-		}
-		else
-		{
-			sprint(self, "Cannot change to an invalid team\n");
-
+			sprint(self, "Cannot change to the given team\n");
 			return;
 		}
-
-		// get starting team
-		if(steam == 1)//scolor == COLOR_TEAM1 - 1)
-			scount = c1;
-		else if(steam == 2)//scolor == COLOR_TEAM2 - 1)
-			scount = c2;
-		else if(steam == 3)//scolor == COLOR_TEAM3 - 1)
-			scount = c3;
-		else // if(steam == 4)//scolor == COLOR_TEAM4 - 1)
-			scount = c4;
-
-		if(scount) // started at a valid, nonempty team
-		{
-			// check if we're trying to change to a larger team that doens't have bots to swap with
-			if(dcount >= scount && dbotcount <= 0)
-			{
-				sprint(self, "Cannot change to a larger team\n");
-				return; // can't change to a larger team
-			}
-		}
 	}
 
 //	bprint("allow change teams from ", ftos(steam), " to ", ftos(dteam), "\n");