From ca42b282e8bea12e5eb3c76ed0ad5120bf95268c Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Sun, 28 Feb 2010 19:46:31 +0000
Subject: [PATCH] fix scale handling

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8730 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/warpzonelib/server.qc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/data/qcsrc/warpzonelib/server.qc b/data/qcsrc/warpzonelib/server.qc
index a92fb1b4c..d64cc92a5 100644
--- a/data/qcsrc/warpzonelib/server.qc
+++ b/data/qcsrc/warpzonelib/server.qc
@@ -435,11 +435,13 @@ void spawnfunc_trigger_warpzone(void)
 	//              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 @@ void spawnfunc_trigger_warpzone(void)
 		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 @@ void spawnfunc_func_camera(void)
 {
 	if(!self.scale)
 		self.scale = self.modelscale;
+	if(!self.scale)
+		self.scale = 1;
  	if(self.model != "")
  	{
  		precache_model(self.model);
-- 
2.39.2