Merge branch 'master' into terencehill/accelerometer_fix

[xonotic/xonotic-data.pk3dir.git] / qcsrc / warpzonelib / util_server.qc

diff --git a/qcsrc/warpzonelib/util_server.qc b/qcsrc/warpzonelib/util_server.qc
index daa8e6ddc17b4c6d23536066a67d3033141ff103..e82c4ba6e212b41a25714f457448382ca4b95cb8 100644 (file)
--- a/qcsrc/warpzonelib/util_server.qc
+++ b/qcsrc/warpzonelib/util_server.qc
@@ -1,3 +1,15 @@
+#include "util_server.qh"
+
+#include "common.qh"
+
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+    #include "../csqcmodellib/sv_model.qh"
+    #include "../dpdefs/dpextensions.qh"
+       #include "../dpdefs/progsdefs.qh"
+#endif
+
 void WarpZoneLib_MoveOutOfSolid_Expand(entity e, vector by)
 {
        float eps = 0.0625;
@@ -19,11 +31,11 @@ float WarpZoneLib_MoveOutOfSolid(entity e)
        o = e.origin;
        traceline(o, o, MOVE_WORLDONLY, e);
        if (trace_startsolid)
-               return FALSE;
+               return false;
 
        tracebox(o, e.mins, e.maxs, o, MOVE_WORLDONLY, e);
        if (!trace_startsolid)
-               return TRUE;
+               return true;
 
        m0 = e.mins;
        m1 = e.maxs;
@@ -47,10 +59,10 @@ float WarpZoneLib_MoveOutOfSolid(entity e)
        if (trace_startsolid)
        {
                setorigin(e, o);
-               return FALSE;
+               return false;
        }
 
-       return TRUE;
+       return true;
 }
 
 float WarpZoneLib_ExactTrigger_Touch()
@@ -67,8 +79,12 @@ void WarpZoneLib_ExactTrigger_Init()
                makevectors (self.angles);
                self.movedir = v_forward;
        }
-       self.warpzone_isboxy = 1;
-       if(self.model != "")
+       if(self.model == "")
+       {
+               // It's a box! No need to match with exacttriggers.
+               self.warpzone_isboxy = 1;
+       }
+       else
        {
                mi = self.mins;
                ma = self.maxs;
@@ -77,11 +93,11 @@ void WarpZoneLib_ExactTrigger_Init()
                // let mapper-set mins/maxs override the model's bounds if set
                if(mi != '0 0 0' || ma != '0 0 0')
                {
+                       // It's a box! No need to match with exacttriggers.
                        self.mins = mi;
                        self.maxs = ma;
+                       self.warpzone_isboxy = 1;
                }
-               else
-                       self.warpzone_isboxy = 0; // enable exacttrigger matching
        }
        setorigin(self, self.origin);
        if(self.scale)