From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 2 Aug 2012 13:52:54 +0000 (+0200)
Subject: g_balance_teams 0 should also turn off imbalance prevention
X-Git-Tag: xonotic-v0.7.0~290^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d223ab50797019b6b0094e1b8175befdec7d3e49;p=xonotic%2Fxonotic-data.pk3dir.git

g_balance_teams 0 should also turn off imbalance prevention
---

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index ee80f812b..c245a30a3 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -884,7 +884,8 @@ void SV_ChangeTeam(float _color)
 		return; // changing teams is not allowed
 	}
 
-	if(autocvar_g_balance_teams_prevent_imbalance)
+	// autocvar_g_balance_teams_prevent_imbalance only makes sense if autocvar_g_balance_teams is on, as it makes the team selection dialog pointless
+	if(autocvar_g_balance_teams && autocvar_g_balance_teams_prevent_imbalance)
 	{
 		GetTeamCounts(self);
 		if(!TeamSmallerEqThanTeam(dteam, steam, self))