From e9eb1d814f34ed214e552b39b015cbd6e9c0a999 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Tue, 7 Apr 2009 13:13:04 +0000
Subject: [PATCH] use -1 as team numbers for spectators (PLEASE TEST)

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6456 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/cl_client.qc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 759040454..8c97c26c9 100644
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -565,6 +565,8 @@ void PutObserverInServer (void)
 	self.oldvelocity = self.velocity;
 	self.customizeentityforclient = Client_customizeentityforclient;
 
+	self.team = -1;
+
 	if(g_arena)
 	{
 		if(self.version_mismatch)
@@ -710,6 +712,9 @@ void PutClientInServer (void)
 	if(self.classname == "player") {
 		entity spot, oldself;
 
+		if(self.team < 0)
+			JoinBestTeam(self, FALSE, TRUE);
+
 		race_PreSpawn();
 
 		spot = SelectSpawnPoint (FALSE);
@@ -978,9 +983,7 @@ void ClientKill_Now_TeamChange()
 		JoinBestTeam( self, FALSE, FALSE );
 	}
 	else
-	{
 		SV_ChangeTeam(self.killindicator_teamchange - 1);
-	}
 }
 
 void ClientKill_Now()
@@ -1137,7 +1140,7 @@ void DoTeamChange(float destteam)
 		if(destteam == -1)
 			return;
 	}
-	if(destteam == self.team && !self.killindicator)
+	if(destteam == self.team && destteam >= 0 && !self.killindicator)
 		return;
 	ClientKill_TeamChange(destteam);
 }
-- 
2.39.2