r2795 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-08-11 07:57:43 -0400 (Sat, 11 Aug 2007)
New Revision: 2795

Modified:
   trunk/data/qcsrc/server/cl_client.qc
Log:
sv_defaultplayercolors should not depend on sv_defaultcharacter (so you can force colors but still allow them to choose models)


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2007-08-11 10:24:18 UTC (rev 2794)
+++ trunk/data/qcsrc/server/cl_client.qc	2007-08-11 11:57:43 UTC (rev 2795)
@@ -493,9 +493,6 @@
 			defaultmodel = cvar_string("sv_defaultplayermodel");
 			setmodel_lod (self, defaultmodel);
 			self.skin = stof(cvar_string("sv_defaultplayerskin"));
-			if(!teams_matter)
-				if(strlen(cvar_string("sv_defaultplayercolors")))
-					setcolor(self, cvar("sv_defaultplayercolors"));
 		} else {
 			self.playermodel = CheckPlayerModel(self.playermodel);
 			setmodel_lod (self, self.playermodel);
@@ -513,6 +510,9 @@
 			else
 				self.skin = stof(self.playerskin);
 		}
+		if(!teams_matter)
+			if(strlen(cvar_string("sv_defaultplayercolors")))
+				setcolor(self, cvar("sv_defaultplayercolors"));
 
 		self.crouch = FALSE;
 		self.view_ofs = PL_VIEW_OFS;
@@ -1393,10 +1393,6 @@
 
 			if (self.skin != cvar("sv_defaultplayerskin"))
 				self.skin = cvar("sv_defaultplayerskin");
-			if(!teams_matter)
-				if(strlen(cvar_string("sv_defaultplayercolors")))
-					if(self.clientcolors != cvar("sv_defaultplayercolors"))
-						setcolor(self, cvar("sv_defaultplayercolors"));
 		} else {
 			if (self.playermodel != self.model)
 			{
@@ -1418,6 +1414,10 @@
 					self.skin = stof(self.playerskin);
 			}
 		}
+		if(!teams_matter)
+			if(strlen(cvar_string("sv_defaultplayercolors")))
+				if(self.clientcolors != cvar("sv_defaultplayercolors"))
+					setcolor(self, cvar("sv_defaultplayercolors"));
 
 		GrapplingHookFrame();