Hopefully fix an oddity in compression

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / teleporters.qh

diff --git a/qcsrc/common/triggers/teleporters.qh b/qcsrc/common/triggers/teleporters.qh
index fb31785e7fdc0901448110a45e109ee1c2eb0fe3..6f5f8cb76e21bec6f941b85e2aebccd767b5ba21 100644 (file)
--- a/qcsrc/common/triggers/teleporters.qh
+++ b/qcsrc/common/triggers/teleporters.qh
@@ -1,5 +1,7 @@
-#ifndef T_TELEPORTERS_H
-#define T_TELEPORTERS_H
+#pragma once
+
+IntrusiveList g_teleporters;
+STATIC_INIT(g_teleporters) { g_teleporters = IL_NEW(); }
 
 .entity pusher;
 const float TELEPORT_FLAG_SOUND = 1;
@@ -17,9 +19,9 @@ const float TELEPORT_SIMPLE = 2; // only do teleport, nothing special
 
 entity Simple_TeleportPlayer(entity teleporter, entity player);
 
-void Teleport_Touch ();
+void Teleport_Touch(entity this, entity toucher);
 
-void teleport_findtarget();
+void teleport_findtarget(entity this);
 
 entity Teleport_Find(vector mi, vector ma);
 
@@ -30,7 +32,7 @@ entity teleport_first;
 
 #ifdef SVQC
 
-void trigger_teleport_use();
+void trigger_teleport_use(entity this, entity actor, entity trigger);
 
 #define TDEATHLOOP(o) \
        entity head; \
@@ -62,10 +64,14 @@ void spawn_tdeath(vector v0, entity e, vector v);
 
 void Reset_ArcBeam(entity player, vector forward);
 
-void WarpZone_PostTeleportPlayer_Callback(entity pl);
 #endif
 
+void WarpZone_PostTeleportPlayer_Callback(entity pl);
+
 #ifdef CSQC
+.entity realowner;
+.float lastteleporttime;
+
 #define TDEATHLOOP(o) \
        entity head; \
        vector deathmin; \
@@ -88,5 +94,3 @@ void WarpZone_PostTeleportPlayer_Callback(entity pl);
                        if(head.isplayermodel) \
                                if(boxesoverlap(deathmin, deathmax, head.absmin, head.absmax))
 #endif
-
-#endif