r5968 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-25 11:26:15 -0500 (Wed, 25 Feb 2009)
New Revision: 5968

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/teamplay.qc
Log:
fix crash with sv_spectate 0 in team games


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-02-25 16:13:31 UTC (rev 5967)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-02-25 16:26:15 UTC (rev 5968)
@@ -1207,13 +1207,27 @@
 	//if(g_domination)
 	//	dom_player_join_team(self);
 
-	//JoinBestTeam(self, FALSE, FALSE);
-	//
 	if((cvar("sv_spectate") == 1 && !g_lms) || cvar("g_campaign")) {
 		self.classname = "observer";
 	} else {
-		self.classname = "player";
-		campaign_bots_may_start = 1;
+		if(cvar("teamplay"))
+		{
+			if(cvar("g_balance_teams") || cvar("g_balance_teams_force"))
+			{
+				self.classname = "player";
+				campaign_bots_may_start = 1;
+				JoinBestTeam(self, FALSE, TRUE);
+			}
+			else
+			{
+				self.classname = "observer"; // do it anyway
+			}
+		}
+		else
+		{
+			self.classname = "player";
+			campaign_bots_may_start = 1;
+		}
 	}
 
 	self.playerid = (playerid_last = playerid_last + 1);

Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2009-02-25 16:13:31 UTC (rev 5967)
+++ trunk/data/qcsrc/server/teamplay.qc	2009-02-25 16:26:15 UTC (rev 5968)
@@ -919,7 +919,7 @@
 		steam = 2;
 	else if(scolor == COLOR_TEAM3 - 1)
 		steam = 3;
-	else if(scolor == COLOR_TEAM4 - 1)
+	else // if(scolor == COLOR_TEAM4 - 1)
 		steam = 4;
 	if(dcolor == COLOR_TEAM1 - 1)
 		dteam = 1;
@@ -927,7 +927,7 @@
 		dteam = 2;
 	else if(dcolor == COLOR_TEAM3 - 1)
 		dteam = 3;
-	else if(dcolor == COLOR_TEAM4 - 1)
+	else // if(dcolor == COLOR_TEAM4 - 1)
 		dteam = 4;
 
 	CheckAllowedTeams(self);