From: Mario <mario@smbclan.net>
Date: Sat, 15 Jul 2017 03:30:24 +0000 (+1000)
Subject: Merge branch 'master' into Mario/target_teleporter_v2
X-Git-Tag: xonotic-v0.8.5~2421^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=183c84009b2439305a2800111912a5d957056d88;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/target_teleporter_v2
---

183c84009b2439305a2800111912a5d957056d88
diff --cc qcsrc/common/triggers/trigger/teleport.qc
index 519d914e0,5f545f014..0330ce8d8
--- a/qcsrc/common/triggers/trigger/teleport.qc
+++ b/qcsrc/common/triggers/trigger/teleport.qc
@@@ -131,29 -100,7 +131,26 @@@ spawnfunc(trigger_teleport
  	}
  
  	IL_PUSH(g_teleporters, this);
- 
- 	this.teleport_next = teleport_first;
- 	teleport_first = this;
  }
 +
 +spawnfunc(target_teleporter)
 +{
 +	if(this.target == "")
 +	{
 +		// actually a destination!
 +		spawnfunc_info_teleport_destination(this);
 +		return;
 +	}
 +
 +	this.active = ACTIVE_ACTIVE;
 +
 +	this.use = target_teleport_use;
 +
 +	if(this.noise != "")
 +		FOREACH_WORD(this.noise, true, precache_sound(it));
 +
 +	InitializeEntity(this, teleport_findtarget, INITPRIO_FINDTARGET);
 +}
  #elif defined(CSQC)
  NET_HANDLE(ENT_CLIENT_TRIGGER_TELEPORT, bool isnew)
  {