Merge branch 'Mario/mehrdad08_spectatorlist' into 'master'

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

diff --git a/qcsrc/lib/warpzone/common.qh b/qcsrc/lib/warpzone/common.qh
index 0ddd0d052a1a41da19c5b151b1be04b7831b1281..f73d079792af9f663775cb4b5294718a16bba03d 100644 (file)
--- a/qcsrc/lib/warpzone/common.qh
+++ b/qcsrc/lib/warpzone/common.qh
@@ -109,9 +109,8 @@ entity WarpZone_RefSys_SpawnSameRefSys(entity me); // spawn().R = me.R
 bool WarpZoneLib_MoveOutOfSolid(entity e);
 #define move_out_of_solid(e) WarpZoneLib_MoveOutOfSolid(e)
 
-bool WarpZoneLib_ExactTrigger_Touch(entity this, entity toucher);
-void WarpZoneLib_ExactTrigger_Init(entity this);
+bool WarpZoneLib_ExactTrigger_Touch(entity this, entity toucher, bool touchfunc);
 
 // WARNING: this kills the trace globals
-#define EXACTTRIGGER_TOUCH(e,t) if(WarpZoneLib_ExactTrigger_Touch((e), (t))) return
-#define EXACTTRIGGER_INIT  WarpZoneLib_ExactTrigger_Init(this)
+#define EXACTTRIGGER_TOUCH(e,t) if(!WarpZoneLib_ExactTrigger_Touch((e), (t), true)) return // intended for use in touch funcs
+#define EXACTTRIGGER_INIT  WarpZoneLib_ExactTrigger_Init(this, true)