X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Fmisc%2Fteleport_dest.qc;h=285f7357f4134608adc110cbdfe3212c5e7a580c;hb=fb7b625a2f9482eb9ae538f15d172b2fcb9742dc;hp=a3c9783537bb9632d691def050eeedb8bf8fa220;hpb=1c758278958da8f2baf1f39cd0f298d5bda097a2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/misc/teleport_dest.qc b/qcsrc/common/triggers/misc/teleport_dest.qc
index a3c978353..285f7357f 100644
--- a/qcsrc/common/triggers/misc/teleport_dest.qc
+++ b/qcsrc/common/triggers/misc/teleport_dest.qc
@@ -1,30 +1,102 @@
+REGISTER_NET_LINKED(ENT_CLIENT_TELEPORT_DEST)
+
 #ifdef SVQC
 
-void spawnfunc_info_teleport_destination (void)
-{SELFPARAM();
-	self.classname = "info_teleport_destination";
+bool teleport_dest_send(entity this, entity to, int sf)
+{
+	WriteHeader(MSG_ENTITY, ENT_CLIENT_TELEPORT_DEST);
+	WriteByte(MSG_ENTITY, sf);
+
+	if(sf & 1)
+	{
+		WriteByte(MSG_ENTITY, this.cnt);
+		WriteCoord(MSG_ENTITY, this.speed);
+		WriteString(MSG_ENTITY, this.targetname);
+		WriteCoord(MSG_ENTITY, this.origin_x);
+		WriteCoord(MSG_ENTITY, this.origin_y);
+		WriteCoord(MSG_ENTITY, this.origin_z);
 
-	self.mangle = self.angles;
-	self.angles = '0 0 0';
+		WriteAngle(MSG_ENTITY, this.mangle_x);
+		WriteAngle(MSG_ENTITY, this.mangle_y);
+		WriteAngle(MSG_ENTITY, this.mangle_z);
+	}
 
-	//setorigin (self, self.origin + '0 0 27');	// To fix a mappers' habit as old as Quake
-	setorigin (self, self.origin);
+	return true;
+}
+
+void teleport_dest_link(entity this)
+{
+	Net_LinkEntity(this, false, 0, teleport_dest_send);
+	this.SendFlags |= 1; // update
+}
+
+spawnfunc(info_teleport_destination)
+{
+	this.classname = "info_teleport_destination";
+
+	this.mangle = this.angles;
+	this.angles = '0 0 0';
+
+	//setorigin (this, this.origin + '0 0 27');	// To fix a mappers' habit as old as Quake
+	setorigin (this, this.origin);
 
 	IFTARGETED
 	{
 	}
 	else
-		objerror ("^3Teleport destination without a targetname");
+		objerror (this, "^3Teleport destination without a targetname");
+
+	teleport_dest_link(this);
 }
 
-void spawnfunc_misc_teleporter_dest (void)
+spawnfunc(misc_teleporter_dest)
 {
-	spawnfunc_info_teleport_destination();
+	spawnfunc_info_teleport_destination(this);
 }
 
-void spawnfunc_target_teleporter (void)
+spawnfunc(target_teleporter)
 {
-	spawnfunc_info_teleport_destination();
+	spawnfunc_info_teleport_destination(this);
+}
+
+#elif defined(CSQC)
+
+void teleport_dest_remove(entity this)
+{
+	//if(this.classname)
+		//strunzone(this.classname);
+	//this.classname = string_null;
+
+	if(this.targetname)
+		strunzone(this.targetname);
+	this.targetname = string_null;
+}
+
+NET_HANDLE(ENT_CLIENT_TELEPORT_DEST, bool isnew)
+{
+	int sf = ReadByte();
+
+	if(sf & 1)
+	{
+		this.classname = "info_teleport_destination";
+		this.cnt = ReadByte();
+		this.speed = ReadCoord();
+		this.targetname = strzone(ReadString());
+		this.origin_x = ReadCoord();
+		this.origin_y = ReadCoord();
+		this.origin_z = ReadCoord();
+
+		this.mangle_x = ReadAngle();
+		this.mangle_y = ReadAngle();
+		this.mangle_z = ReadAngle();
+
+		setorigin(this, this.origin);
+
+		this.drawmask = MASK_NORMAL;
+		this.entremove = teleport_dest_remove;
+	}
+
+	return = true;
 }
 
 #endif