Merge branch 'master' into terencehill/hud_fixes

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / trigger / teleport.qc

diff --git a/qcsrc/common/triggers/trigger/teleport.qc b/qcsrc/common/triggers/trigger/teleport.qc
index 37c4d1def7b0a82f0ed76910ac1bcc817d94a858..be8040079b91f36670492816498228debff65bfa 100644 (file)
--- a/qcsrc/common/triggers/trigger/teleport.qc
+++ b/qcsrc/common/triggers/trigger/teleport.qc
@@ -75,7 +75,7 @@ float trigger_teleport_send(entity this, entity to, float sf)
 
 void trigger_teleport_link(entity this)
 {
-       trigger_link(this, trigger_teleport_send);
+       //trigger_link(this, trigger_teleport_send);
 }
 
 spawnfunc(trigger_teleport)
@@ -83,11 +83,12 @@ spawnfunc(trigger_teleport)
        self.angles = '0 0 0';
 
        self.active = ACTIVE_ACTIVE;
-       trigger_init(self);
+       //trigger_init(self); // only for predicted triggers?
+       EXACTTRIGGER_INIT;
        self.use = trigger_teleport_use;
 
        if(self.noise != "")
-               precache_sound(self.noise);
+               FOREACH_WORD(self.noise, true, precache_sound(it));
 
        // this must be called to spawn the teleport waypoints for bots
        InitializeEntity(self, teleport_findtarget, INITPRIO_FINDTARGET);