Remove oldself variables

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / gamemode_ctf.qc

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 28775ea0171f57bb64db8b4cd0f11f5f4a858c76..6cf7c1a6546b4044f0a2a2bf8f69e763bfdcf6b1 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -846,11 +846,10 @@ void ctf_FlagThink()
                                self.health = 0;
                                ctf_CheckFlagReturn(self, RETURN_SPEEDRUN);
 
-                               tmp_entity = self;
                                setself(self.owner);
                                self.impulse = CHIMPULSE_SPEEDRUN; // move the player back to the waypoint they set
                                ImpulseCommands();
-                               setself(tmp_entity);
+                               setself(this);
                        }
                        if(autocvar_g_ctf_stalemate)
                        {
@@ -2382,7 +2381,6 @@ void ctf_ScoreRules(int teams)
 // code from here on is just to support maps that don't have flag and team entities
 void ctf_SpawnTeam (string teamname, int teamcolor)
 {SELFPARAM();
-       entity oldself = self;
        setself(spawn());
        self.classname = "ctf_team";
        self.netname = teamname;
@@ -2390,7 +2388,7 @@ void ctf_SpawnTeam (string teamname, int teamcolor)
 
        spawnfunc_ctf_team();
 
-       setself(oldself);
+       setself(this);
 }
 
 void ctf_DelayedInit() // Do this check with a delay so we can wait for teams to be set up.