Merge branch 'master' into martin-t/globals

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

diff --git a/qcsrc/lib/warpzone/server.qh b/qcsrc/lib/warpzone/server.qh
index c6c7b9840c9c86dee6b67093a1e38f6e8cd87189..4287ef60de798195e0e963d93736a7348a88d175 100644 (file)
--- a/qcsrc/lib/warpzone/server.qh
+++ b/qcsrc/lib/warpzone/server.qh
@@ -1,13 +1,14 @@
-#ifndef LIB_WARPZONE_SERVER_H
-#define LIB_WARPZONE_SERVER_H
+#pragma once
 
 #ifdef SVQC
+entity warpzone_first; .entity warpzone_next;
+
 void WarpZone_StartFrame();
-float WarpZone_Projectile_Touch(entity this);
+float WarpZone_Projectile_Touch(entity this, entity toucher);
 
 // THESE must be defined by calling QC code:
 void WarpZone_PostTeleportPlayer_Callback(entity pl);
-float WarpZone_Projectile_Touch_ImpactFilter_Callback();
+bool WarpZone_Projectile_Touch_ImpactFilter_Callback(entity this, entity toucher);
 
 // server must also define a float called ENT_CLIENT_WARPZONE for the initial byte of WarpZone entities
 //const float ENT_CLIENT_WARPZONE;
@@ -17,5 +18,3 @@ void WarpZone_PlayerPhysics_FixVAngle(entity this);
 
 void WarpZone_PostInitialize_Callback();
 #endif
-
-#endif