r2797 - in branches/nexuiz-2.0/data: . qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat Aug 11 08:03:21 EDT 2007


Author: div0
Date: 2007-08-11 08:03:21 -0400 (Sat, 11 Aug 2007)
New Revision: 2797

Modified:
   branches/nexuiz-2.0/data/default.cfg
   branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
Log:
sv_defaultplayercolors no longer depends on sv_defaultcharacter!


Modified: branches/nexuiz-2.0/data/default.cfg
===================================================================
--- branches/nexuiz-2.0/data/default.cfg	2007-08-11 12:02:58 UTC (rev 2796)
+++ branches/nexuiz-2.0/data/default.cfg	2007-08-11 12:03:21 UTC (rev 2797)
@@ -125,7 +125,7 @@
 seta sv_defaultcharacter 0
 seta sv_defaultplayermodel models/player/nexus.zym
 seta sv_defaultplayerskin 0
-seta sv_defaultplayercolors "" // set to 16*shirt+pants to force a color
+seta sv_defaultplayercolors "" // set to 16*shirt+pants to force a color, note: it does NOT depend on defaultcharacter! Set to "" to disable
 set sv_autoscreenshot 0
 net_messagetimeout 300
 net_connecttimeout 30

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2007-08-11 12:02:58 UTC (rev 2796)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2007-08-11 12:03:21 UTC (rev 2797)
@@ -477,9 +477,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);
@@ -497,6 +494,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;
@@ -1370,10 +1370,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)
 			{
@@ -1395,6 +1391,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();
 




More information about the nexuiz-commits mailing list