From bdef966bcf4a927003ae6d78247013742cdc8a06 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Tue, 4 Aug 2009 19:24:58 +0000
Subject: [PATCH] fix last fix

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7337 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/client/Main.qc | 47 +++++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/data/qcsrc/client/Main.qc b/data/qcsrc/client/Main.qc
index a00e72fad..57f3df013 100644
--- a/data/qcsrc/client/Main.qc
+++ b/data/qcsrc/client/Main.qc
@@ -176,21 +176,40 @@ void CSQC_Shutdown(void)
 float SetTeam(entity o, float Team)
 {
 	entity tm;
-	switch(Team)
+	if(teamplay)
 	{
-		case -1:
-		case COLOR_TEAM1:
-		case COLOR_TEAM2:
-		case COLOR_TEAM3:
-		case COLOR_TEAM4:
-			break;
-		default:
-			if(GetTeam(Team, false) == NULL)
-			{
-				print("trying to switch to unsupported team ", ftos(Team), "\n");
-				Team = COLOR_SPECTATOR;
-			}
-			break;
+		switch(Team)
+		{
+			case -1:
+			case COLOR_TEAM1:
+			case COLOR_TEAM2:
+			case COLOR_TEAM3:
+			case COLOR_TEAM4:
+				break;
+			default:
+				if(GetTeam(Team, false) == NULL)
+				{
+					print("trying to switch to unsupported team ", ftos(Team), "\n");
+					Team = COLOR_SPECTATOR;
+				}
+				break;
+		}
+	}
+	else
+	{
+		switch(Team)
+		{
+			case -1:
+			case 0:
+				break;
+			default:
+				if(GetTeam(Team, false) == NULL)
+				{
+					print("trying to switch to unsupported team ", ftos(Team), "\n");
+					Team = COLOR_SPECTATOR;
+				}
+				break;
+		}
 	}
 	if(Team == -1) // leave
 	{
-- 
2.39.2