From 913335a3032d2d552f8d622087944f25f27b46c5 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Tue, 4 Aug 2009 19:13:48 +0000
Subject: [PATCH] fix "white team bug"

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7335 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/client/Main.qc | 16 +++++++++++++++-
 data/qcsrc/client/sbar.qc | 10 ++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/data/qcsrc/client/Main.qc b/data/qcsrc/client/Main.qc
index 513ef562a..d1b149b11 100644
--- a/data/qcsrc/client/Main.qc
+++ b/data/qcsrc/client/Main.qc
@@ -176,6 +176,20 @@ void CSQC_Shutdown(void)
 float SetTeam(entity o, float Team)
 {
 	entity tm;
+	switch(Team)
+	{
+		case -1:
+		case COLOR_TEAM1:
+		case COLOR_TEAM2:
+		case COLOR_TEAM3:
+		case COLOR_TEAM4:
+		case COLOR_SPECTATOR:
+			break;
+		default:
+			print("trying to switch to unsupported team ", ftos(Team), "\n");
+			Team = COLOR_SPECTATOR;
+			break;
+	}
 	if(Team == -1) // leave
 	{
 		if(o.has_team)
@@ -610,7 +624,7 @@ void Ent_ReadTeamScore()
 	entity o;
 
 	self.team = ReadByte();
-	o = self.owner = GetTeam(self.team, true);
+	o = self.owner = GetTeam(self.team, true); // these team numbers can always be trusted
 
 #if MAX_TEAMSCORE <= 3
 	for(i = 0; i < MAX_TEAMSCORE; ++i)
diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 1573af810..798e714cc 100644
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -424,7 +424,7 @@ string Sbar_DefaultColumnLayout()
 		"-teams,race,lms/kills -teams,lms/deaths -teams,lms,race/suicides -race,dm,tdm/frags ", // tdm already has this in "score"
 		"+ctf/caps +ctf/pickups +ctf/fckills +ctf/returns ",
 		"+lms/lives +lms/rank ",
-		"+/caps +kh/pushes +kh/destroyed ",
+		"+kh/caps +kh/pushes +kh/destroyed ",
 		"?+race/laps ?+race/time ?+race/fastest ",
 		"+as/objectives +nexball/faults +nexball/goals ",
 		"-lms,race,nexball/score");
@@ -1088,7 +1088,13 @@ void Sbar_DrawScoreboard()
 
 		tm = teams.sort_next;
 
-		pos = Sbar_Scoreboard_MakeTable(pos, tm, rgb, bg_size);
+		for(tm = teams.sort_next; tm; tm = tm.sort_next)
+		{
+			if(tm.team == COLOR_SPECTATOR)
+				continue;
+
+			pos = Sbar_Scoreboard_MakeTable(pos, tm, rgb, bg_size);
+		}
 	}
 
 	tmp = pos + '0 1.5 0' * sbar_fontsize_y;
-- 
2.39.2