Merge branch 'master' into Mario/target_teleporter_v2
authorMario <mario@smbclan.net>
Sat, 15 Jul 2017 03:30:24 +0000 (13:30 +1000)
committerMario <mario@smbclan.net>
Sat, 15 Jul 2017 03:30:24 +0000 (13:30 +1000)
1  2 
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)
  {