X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftrigger%2Fteleport.qc;h=5f545f01418488f4375c229715a06040e3fb2c87;hb=050fb0011ae5fb2b36c7c7f3d560f9453807a8ab;hp=484daeedf9d3f0b645f50094c830e79713bfebf8;hpb=0ff1afbe6825c541b231fb4c4cfcbf60cbb5ecd7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/trigger/teleport.qc b/qcsrc/common/triggers/trigger/teleport.qc
index 484daeedf..5f545f014 100644
--- a/qcsrc/common/triggers/trigger/teleport.qc
+++ b/qcsrc/common/triggers/trigger/teleport.qc
@@ -1,3 +1,4 @@
+#include "teleport.qh"
 REGISTER_NET_LINKED(ENT_CLIENT_TRIGGER_TELEPORT)
 
 #ifdef SVQC
@@ -42,7 +43,7 @@ void Teleport_Touch(entity this, entity toucher)
 
 #ifdef SVQC
 	if(IS_PLAYER(toucher))
-		RemoveGrapplingHook(toucher);
+		RemoveGrapplingHooks(toucher);
 #endif
 
 	entity e;
@@ -98,13 +99,14 @@ spawnfunc(trigger_teleport)
 		return;
 	}
 
-	this.teleport_next = teleport_first;
-	teleport_first = this;
+	IL_PUSH(g_teleporters, this);
 }
 #elif defined(CSQC)
 NET_HANDLE(ENT_CLIENT_TRIGGER_TELEPORT, bool isnew)
 {
 	this.classname = "trigger_teleport";
+	if(isnew)
+		IL_PUSH(g_teleporters, this);
 	int mytm = ReadByte(); if(mytm) { this.team = mytm - 1; }
 	this.spawnflags = ReadInt24_t();
 	this.active = ReadByte();
@@ -114,13 +116,10 @@ NET_HANDLE(ENT_CLIENT_TRIGGER_TELEPORT, bool isnew)
 
 	this.entremove = trigger_remove_generic;
 	this.solid = SOLID_TRIGGER;
-	//this.move_touch = trigger_push_touch;
+	//settouch(this, trigger_push_touch);
 	this.move_time = time;
 	defer(this, 0.25, teleport_findtarget);
 
-	this.teleport_next = teleport_first;
-	teleport_first = this;
-
 	return true;
 }