Reorganise item code so that VM-specific code is in its correct directories and not...

[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 3bff39be1fd954f89ff4984828aa0af67dad42bd..830c56de65f0cca4834131760898e93b9a148006 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>
@@ -786,7 +786,12 @@ entity WarpZone_RefSys_SpawnSameRefSys(entity me)
 
 bool WarpZoneLib_ExactTrigger_Touch(entity this, entity toucher)
 {
-       return !WarpZoneLib_BoxTouchesBrush(toucher.absmin, toucher.absmax, this, 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';
+       return !WarpZoneLib_BoxTouchesBrush(emin, emax, this, toucher);
 }