Step 6: complete

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

diff --git a/qcsrc/common/triggers/teleporters.qc b/qcsrc/common/triggers/teleporters.qc
index 40ba61f6519bb96ff5a9f87d6815f154a959a4c7..475904d21eafb3e78597ab056955d237f4cab94c 100644 (file)
--- a/qcsrc/common/triggers/teleporters.qc
+++ b/qcsrc/common/triggers/teleporters.qc
@@ -68,7 +68,7 @@ void spawn_tdeath(vector v0, entity e, vector v)
 #endif
 
 void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angles, vector to_velocity, vector telefragmin, vector telefragmax, float tflags)
-{SELFPARAM();
+{
        entity telefragger;
        vector from;
 
@@ -82,7 +82,7 @@ void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angle
 #ifdef SVQC
        if(player.teleportable == TELEPORT_NORMAL) // don't play sounds or show particles for anything that isn't a player, maybe change later to block only observers
        {
-               if(self.pushltime < time) // only show one teleport effect per teleporter per 0.2 seconds, for better fps
+               if(teleporter.pushltime < time) // only show one teleport effect per teleporter per 0.2 seconds, for better fps
                {
                        if(tflags & TELEPORT_FLAG_SOUND)
                        {
@@ -103,7 +103,7 @@ void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angle
                                Send_Effect(EFFECT_TELEPORT, player.origin, '0 0 0', 1);
                                Send_Effect(EFFECT_TELEPORT, to + v_forward * 32, '0 0 0', 1);
                        }
-                       self.pushltime = time + 0.2;
+                       teleporter.pushltime = time + 0.2;
                }
        }
 #endif
@@ -246,16 +246,16 @@ entity Simple_TeleportPlayer(entity teleporter, entity player)
        return e;
 }
 
-void teleport_findtarget()
+void teleport_findtarget(entity this)
 {
        int n = 0;
        entity e;
-       for(e = world; (e = find(e, targetname, self.target)); )
+       for(e = world; (e = find(e, targetname, this.target)); )
        {
                ++n;
 #ifdef SVQC
                if(e.movetype == MOVETYPE_NONE)
-                       waypoint_spawnforteleporter(self, e.origin, 0);
+                       waypoint_spawnforteleporter(this, e.origin, 0);
                if(e.classname != "info_teleport_destination")
                        LOG_INFO("^3MAPPER ERROR: teleporter does target an invalid teleport destination entity. Angles will not work.\n");
 #endif
@@ -264,27 +264,24 @@ void teleport_findtarget()
        if(n == 0)
        {
                // no dest!
-               objerror ("Teleporter with nonexistant target");
+               objerror (this, "Teleporter with nonexistant target");
                return;
        }
        else if(n == 1)
        {
                // exactly one dest - bots love that
-               self.enemy = find(e, targetname, self.target);
+               this.enemy = find(e, targetname, this.target);
        }
        else
        {
                // have to use random selection every single time
-               self.enemy = world;
+               this.enemy = world;
        }
 
        // now enable touch
+       settouch(this, Teleport_Touch);
 #ifdef SVQC
-       self.touch = Teleport_Touch;
-
-       trigger_teleport_link(self);
-#elif defined(CSQC)
-       self.move_touch = Teleport_Touch;
+       trigger_teleport_link(this);
 #endif
 }
 
@@ -298,7 +295,7 @@ entity Teleport_Find(vector mi, vector ma)
 }
 
 void WarpZone_PostTeleportPlayer_Callback(entity pl)
-{SELFPARAM();
+{
 #ifdef SVQC
        makevectors(pl.angles);
        Reset_ArcBeam(pl, v_forward);