From ae4d3cabca63fe30fb6c9da816497b96eca198de Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 11 Aug 2007 11:57:43 +0000 Subject: [PATCH] sv_defaultplayercolors should not depend on sv_defaultcharacter (so you can force colors but still allow them to choose models) git-svn-id: svn://svn.icculus.org/nexuiz/trunk@2795 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_client.qc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index a4fde7e88..c3a6a6248 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -493,9 +493,6 @@ void PutClientInServer (void) 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 @@ void PutClientInServer (void) 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 @@ void PlayerPreThink (void) 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 @@ void PlayerPreThink (void) 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(); -- 2.39.2