From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 4 Aug 2010 13:28:38 +0000 (+0200)
Subject: ExactTrigger_Init: let map-specified mins/maxs override the setmodel ones, if nonzero
X-Git-Tag: xonotic-v0.1.0preview~266^2~21
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e88f650fcd1cf566da7400fb78037add1eb2996b;p=xonotic%2Fxonotic-data.pk3dir.git

ExactTrigger_Init: let map-specified mins/maxs override the setmodel ones, if nonzero
---

diff --git a/qcsrc/warpzonelib/util_server.qc b/qcsrc/warpzonelib/util_server.qc
index 85d99333a..9aae116c7 100644
--- a/qcsrc/warpzonelib/util_server.qc
+++ b/qcsrc/warpzonelib/util_server.qc
@@ -60,6 +60,7 @@ float WarpZoneLib_ExactTrigger_Touch()
 
 void WarpZoneLib_ExactTrigger_Init()
 {
+	vector mi, ma;
 	if (self.movedir == '0 0 0')
 	if (self.angles != '0 0 0')
 	{
@@ -68,8 +69,16 @@ void WarpZoneLib_ExactTrigger_Init()
 	}
  	if(self.model != "")
  	{
+		mi = self.mins;
+		ma = self.maxs;
  		precache_model(self.model);
  		setmodel(self, self.model);
+		// let mapper-set mins/maxs override the model's bounds if set
+		if(mi != '0 0 0' || ma != '0 0 0')
+		{
+			self.mins = mi;
+			self.maxs = ma;
+		}
  	}
 	setorigin(self, self.origin);
 	if(self.scale)