[nexuiz-commits] r7069 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Jun 21 06:38:24 EDT 2009
Author: div0
Date: 2009-06-21 06:38:24 -0400 (Sun, 21 Jun 2009)
New Revision: 7069
Modified:
trunk/data/qcsrc/server/cl_client.qc
Log:
forbid the fbskin when forcing player models
Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2009-06-21 10:35:39 UTC (rev 7068)
+++ trunk/data/qcsrc/server/cl_client.qc 2009-06-21 10:38:24 UTC (rev 7069)
@@ -410,7 +410,10 @@
if(other.cvar_cl_forceplayermodels && sv_clforceplayermodels)
modelsource = other;
- self.skin = modelsource.skinindex;
+ if(modelsource == self)
+ self.skin = modelsource.skinindex;
+ else
+ self.skin = mod(modelsource.skinindex, 3); // forbid the fbskins as forced skins
#ifdef ALLOW_VARIABLE_LOD
// self: me
@@ -638,9 +641,7 @@
if(!teams_matter)
return s;
if(s == 6)
- if not(self.cvar_cl_forceplayermodels)
- if not(self.cvar_cl_forceplayermodelsfromnexuiz)
- return 6;
+ return 6;
return mod(s, 3);
}
More information about the nexuiz-commits
mailing list