]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
allow overriding mins/maxs in triggers
authorRudolf Polzer <divverent@xonotic.org>
Tue, 25 Sep 2012 11:22:28 +0000 (13:22 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 25 Sep 2012 11:22:28 +0000 (13:22 +0200)
qcsrc/server/g_subs.qc

index df63a70bb85d4f01578823b1b4ea3ceaba48f8ce..a45c5a5bf9b7782658ba8b7b46b723c5f9e95eee 100644 (file)
@@ -799,7 +799,15 @@ void SetBrushEntityModel()
        if(self.model != "")
        {
                precache_model(self.model);
-               setmodel(self, self.model); // no precision needed
+               if(self.mins || self.maxs)
+               {
+                       vector mi = self.mins;
+                       vector ma = self.maxs;
+                       setmodel(self, self.model); // no precision needed
+                       setsize(self, mi, ma);
+               }
+               else
+                       setmodel(self, self.model); // no precision needed
                InitializeEntity(self, LODmodel_attach, INITPRIO_FINDTARGET);
        }
        setorigin(self, self.origin);
@@ -811,7 +819,15 @@ void SetBrushEntityModelNoLOD()
        if(self.model != "")
        {
                precache_model(self.model);
-               setmodel(self, self.model); // no precision needed
+               if(self.mins || self.maxs)
+               {
+                       vector mi = self.mins;
+                       vector ma = self.maxs;
+                       setmodel(self, self.model); // no precision needed
+                       setsize(self, mi, ma);
+               }
+               else
+                       setmodel(self, self.model); // no precision needed
        }
        setorigin(self, self.origin);
        ApplyMinMaxScaleAngles(self);