[nexuiz-commits] r7068 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-06-21 06:35:39 -0400 (Sun, 21 Jun 2009)
New Revision: 7068

Modified:
   trunk/data/qcsrc/server/cl_client.qc
Log:
when forcing models, do not allow the fbskins


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-06-21 10:32:18 UTC (rev 7067)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-06-21 10:35:39 UTC (rev 7068)
@@ -404,8 +404,8 @@
 		return TRUE;
 
 	modelsource = self;
-	if(!self.modelindex_lod0_from_nexuiz)
-		if(other.cvar_cl_forceplayermodelsfromnexuiz)
+	if(other.cvar_cl_forceplayermodelsfromnexuiz)
+		if not(self.modelindex_lod0_from_nexuiz)
 			modelsource = other;
 	if(other.cvar_cl_forceplayermodels && sv_clforceplayermodels)
 		modelsource = other;
@@ -638,7 +638,9 @@
 	if(!teams_matter)
 		return s;
 	if(s == 6)
-		return 6;
+		if not(self.cvar_cl_forceplayermodels)
+			if not(self.cvar_cl_forceplayermodelsfromnexuiz)
+				return 6;
 	return mod(s, 3);
 }