[nexuiz-commits] r8730 - trunk/data/qcsrc/warpzonelib

[DONOTREPLY at icculus.org]

Author: div0
Date: 2010-02-28 14:46:31 -0500 (Sun, 28 Feb 2010)
New Revision: 8730

Modified:
   trunk/data/qcsrc/warpzonelib/server.qc
Log:
fix scale handling

Modified: trunk/data/qcsrc/warpzonelib/server.qc
===================================================================
--- trunk/data/qcsrc/warpzonelib/server.qc	2010-02-28 19:46:26 UTC (rev 8729)
+++ trunk/data/qcsrc/warpzonelib/server.qc	2010-02-28 19:46:31 UTC (rev 8730)
@@ -435,11 +435,13 @@
 	//              the map, with another killtarget to designate its
 	//              orientation
 
+	if(!self.scale)
+		self.scale = self.modelscale;
+	if(!self.scale)
+		self.scale = 1;
 	string m;
 	m = self.model;
 	WarpZoneLib_ExactTrigger_Init();
-	if(!self.scale)
-		self.scale = self.modelscale;
  	if(m != "")
  	{
  		precache_model(m);
@@ -450,8 +452,6 @@
 		setsize(self, self.mins * self.scale, self.maxs * self.scale);
 	else
 		setsize(self, self.mins, self.maxs);
-	if(!self.scale)
-		self.scale = self.modelscale;
 	self.SendEntity = WarpZone_Send;
 	self.SendFlags = 0xFFFFFF;
 	self.effects |= EF_NODEPTHTEST;
@@ -462,6 +462,8 @@
 {
 	if(!self.scale)
 		self.scale = self.modelscale;
+	if(!self.scale)
+		self.scale = 1;
  	if(self.model != "")
  	{
  		precache_model(self.model);