Merge branch 'master' into bones_was_here/q3compat

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / warpzone / common.qc

diff --git a/qcsrc/lib/warpzone/common.qc b/qcsrc/lib/warpzone/common.qc
index 120551b4e3595dccc9506f4fea2908639c4095cf..e4824d60f11685b90e137b200955f398e17d96cd 100644 (file)
--- a/qcsrc/lib/warpzone/common.qc
+++ b/qcsrc/lib/warpzone/common.qc
@@ -1,7 +1,7 @@
 #include "common.qh"
 
 #if defined(CSQC)
-    #include <common/t_items.qh>
+    #include <client/items/items.qh>
 #elif defined(MENUQC)
 #elif defined(SVQC)
     #include <common/weapons/_all.qh>
@@ -778,8 +778,7 @@ void WarpZone_RefSys_Copy(entity me, entity from)
 }
 entity WarpZone_RefSys_SpawnSameRefSys(entity me)
 {
-       entity e;
-       e = spawn();
+       entity e = spawn();
        WarpZone_RefSys_Copy(e, me);
        return e;
 }
@@ -787,10 +786,13 @@ entity WarpZone_RefSys_SpawnSameRefSys(entity me)
 bool WarpZoneLib_ExactTrigger_Touch(entity this, entity toucher)
 {
        vector emin = toucher.absmin, emax = toucher.absmax;
-       // the engine offsets absolute bounding boxes by a single quake unit
-       // we must undo that here to allow accurate touching
-       emin += '1 1 1';
-       emax -= '1 1 1';
+       if(STAT(Q3COMPAT))
+       {
+               // DP's tracebox enlarges absolute bounding boxes by a single quake unit
+               // we must undo that here to allow accurate touching
+               emin += '1 1 1';
+               emax -= '1 1 1';
+       }
        return !WarpZoneLib_BoxTouchesBrush(emin, emax, this, toucher);
 }