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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-06-30 13:33:35 -0400 (Tue, 30 Jun 2009)
New Revision: 7133

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
some LOD stuff fixes


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-06-30 14:41:34 UTC (rev 7132)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-06-30 17:33:35 UTC (rev 7133)
@@ -369,15 +369,15 @@
 		return FallbackPlayerModel;
 	else if(cvar("sv_servermodelsonly"))
 	{
-		if(substring(plyermodel,strlen(plyermodel)-4,4) != ".zym")
-		if(substring(plyermodel,strlen(plyermodel)-4,4) != ".dpm")
-		if(substring(plyermodel,strlen(plyermodel)-4,4) != ".md3")
-		if(substring(plyermodel,strlen(plyermodel)-4,4) != ".psk")
+		if(substring(plyermodel,-4,4) != ".zym")
+		if(substring(plyermodel,-4,4) != ".dpm")
+		if(substring(plyermodel,-4,4) != ".md3")
+		if(substring(plyermodel,-4,4) != ".psk")
 			return FallbackPlayerModel;
 		// forbid the LOD models
-		if(substring(plyermodel, strlen(plyermodel)-6,2) == "_lod1")
+		if(substring(plyermodel, -9,5) == "_lod1")
 			return FallbackPlayerModel;
-		if(substring(plyermodel, strlen(plyermodel)-6,2) == "_lod2")
+		if(substring(plyermodel, -9,5) == "_lod2")
 			return FallbackPlayerModel;
 		if(plyermodel != strtolower(plyermodel))
 			return FallbackPlayerModel;
@@ -464,7 +464,7 @@
 	string s;
 
 	// FIXME: this only supports 3-letter extensions
-	s = strcat(substring(modelname, 0, strlen(modelname) - 4), "_lod1", substring(modelname, 0, strlen(modelname) - 4));
+	s = strcat(substring(modelname, 0, -4), "_lod1", substring(modelname, -4, 4));
 	if(fexists(s))
 	{
 		precache_model(s);
@@ -474,7 +474,7 @@
 	else
 		self.modelindex_lod1 = -1;
 
-	s = strcat(substring(modelname, 0, strlen(modelname) - 4), "_lod2", substring(modelname, 0, strlen(modelname) - 4));
+	s = strcat(substring(modelname, 0, -4), "_lod2", substring(modelname, -4, 4));
 	if(fexists(s))
 	{
 		precache_model(s);

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-06-30 14:41:34 UTC (rev 7132)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-06-30 17:33:35 UTC (rev 7133)
@@ -1348,9 +1348,9 @@
 #ifdef ALLOW_VARIABLE_LOD
         precache_model(f);
 #endif
-	if(substring(f, strlen(f)-6,2) == "_lod1")
+	if(substring(f, -9,5) == "_lod1")
 		continue;
-	if(substring(f, strlen(f)-6,2) == "_lod2")
+	if(substring(f, -9,5) == "_lod2")
 		continue;
 #ifndef ALLOW_VARIABLE_LOD
         precache_model(f);