X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fwarpzone%2Fcommon.qh;h=0ddd0d052a1a41da19c5b151b1be04b7831b1281;hb=d08271e0bd432bb18e11dd19cdf69410d8b5f9c1;hp=6669ae1aff4d300c7cde3fc0f9bfc34ce3feb4a3;hpb=a7bdc71738ce2bcabf678c3c78d45baf928d4261;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/lib/warpzone/common.qh b/qcsrc/lib/warpzone/common.qh index 6669ae1af..0ddd0d052 100644 --- a/qcsrc/lib/warpzone/common.qh +++ b/qcsrc/lib/warpzone/common.qh @@ -1,9 +1,11 @@ -#ifndef LIB_WARPZONE_COMMON_H -#define LIB_WARPZONE_COMMON_H +#pragma once // uncomment this if your mod uses the roll angle in fixangle // #define KEEP_ROLL +IntrusiveList g_warpzones; +STATIC_INIT(g_warpzones) { g_warpzones = IL_NEW(); } + float warpzone_warpzones_exist; float warpzone_cameras_exist; @@ -104,13 +106,12 @@ entity WarpZone_RefSys_SpawnSameRefSys(entity me); // spawn().R = me.R #ifndef BITXOR_ASSIGN # define BITXOR_ASSIGN(a,b) ((a) = ((a) | (b)) - ((a) & (b))) #endif -float WarpZoneLib_MoveOutOfSolid(entity e); +bool WarpZoneLib_MoveOutOfSolid(entity e); #define move_out_of_solid(e) WarpZoneLib_MoveOutOfSolid(e) -float WarpZoneLib_ExactTrigger_Touch(entity this, entity toucher); +bool WarpZoneLib_ExactTrigger_Touch(entity this, entity toucher); void WarpZoneLib_ExactTrigger_Init(entity this); // 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) -#endif