X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fwarpzone%2Fcommon.qh;h=6669ae1aff4d300c7cde3fc0f9bfc34ce3feb4a3;hb=678388b78fdaad89fc8218dadf7007432b4153c3;hp=ebea01108dc72927c5180964e4599ed85e2262ff;hpb=199bb68d2041f31a18ed33378e41512e97b9be37;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/lib/warpzone/common.qh b/qcsrc/lib/warpzone/common.qh index ebea01108..6669ae1af 100644 --- a/qcsrc/lib/warpzone/common.qh +++ b/qcsrc/lib/warpzone/common.qh @@ -107,10 +107,10 @@ entity WarpZone_RefSys_SpawnSameRefSys(entity me); // spawn().R = me.R float WarpZoneLib_MoveOutOfSolid(entity e); #define move_out_of_solid(e) WarpZoneLib_MoveOutOfSolid(e) -float WarpZoneLib_ExactTrigger_Touch(); -void WarpZoneLib_ExactTrigger_Init(); +float WarpZoneLib_ExactTrigger_Touch(entity this, entity toucher); +void WarpZoneLib_ExactTrigger_Init(entity this); // WARNING: this kills the trace globals -#define EXACTTRIGGER_TOUCH if(WarpZoneLib_ExactTrigger_Touch()) return -#define EXACTTRIGGER_INIT WarpZoneLib_ExactTrigger_Init() +#define EXACTTRIGGER_TOUCH(e,t) if(WarpZoneLib_ExactTrigger_Touch((e), (t))) return +#define EXACTTRIGGER_INIT WarpZoneLib_ExactTrigger_Init(this) #endif