From 37c3a64765b8033c6c6b8bcc3d9b1f370c69b8ff Mon Sep 17 00:00:00 2001
From: savagex <savagex@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Mon, 26 Dec 2005 11:43:57 +0000
Subject: [PATCH] color handling: tidy up

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@724 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/gamec/teamplay.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/data/qcsrc/gamec/teamplay.c b/data/qcsrc/gamec/teamplay.c
index d45d05665..57c2b8d15 100644
--- a/data/qcsrc/gamec/teamplay.c
+++ b/data/qcsrc/gamec/teamplay.c
@@ -634,15 +634,14 @@ void SV_ChangeTeam(float _color)
 {
 	float scolor, dcolor, steam, dteam, dbotcount, scount, dcount;
 
-	scolor = self.clientcolors & 0x0F;
-	dcolor = _color & 0x0F;
-
-	// store shirt color in .clientcolors
-	// this will get overwritten in teamplay modes later
+	// in normal deathmatch we can just apply the color and we're done
 	if(!cvar("teamplay")) {
 		SetPlayerColors(self, _color);
 		return;
 	}
+	
+	scolor = self.clientcolors & 0x0F;
+	dcolor = _color & 0x0F;
 
 	if(scolor == COLOR_TEAM1 - 1)
 		steam = 1;
-- 
2.39.2