From e88f650fcd1cf566da7400fb78037add1eb2996b Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Wed, 4 Aug 2010 15:28:38 +0200 Subject: [PATCH] ExactTrigger_Init: let map-specified mins/maxs override the setmodel ones, if nonzero --- qcsrc/warpzonelib/util_server.qc | 9 +++++++++ 1 file changed, 9 insertions(+) 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) -- 2.39.2