Merge branch 'master' into Mario/snake

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

diff --git a/qcsrc/common/triggers/triggers.qc b/qcsrc/common/triggers/triggers.qc
index bd67c1479a97ba80708e146c30c9dc6d89d23770..73c5c49651259aaa9376945cc6e1c080df0bb91b 100644 (file)
--- a/qcsrc/common/triggers/triggers.qc
+++ b/qcsrc/common/triggers/triggers.qc
@@ -138,7 +138,7 @@ match (string)self.target and call their .use function
 */
 void SUB_UseTargets()
 {SELFPARAM();
-       entity t, stemp, otemp, act;
+       entity t, otemp, act;
        string s;
        float i;
 
@@ -173,7 +173,7 @@ void SUB_UseTargets()
        {
                centerprint(activator, self.message);
                if (self.noise == "")
-                       play2(activator, "misc/talk.wav");
+                       play2(activator, SND(TALK));
        }
 
 //
@@ -191,10 +191,9 @@ void SUB_UseTargets()
 // fire targets
 //
        act = activator;
-       stemp = self;
        otemp = other;
 
-       if(stemp.target_random)
+       if(this.target_random)
                RandomSelection_Init();
 
        for(i = 0; i < 4; ++i)
@@ -202,10 +201,10 @@ void SUB_UseTargets()
                switch(i)
                {
                        default:
-                       case 0: s = stemp.target; break;
-                       case 1: s = stemp.target2; break;
-                       case 2: s = stemp.target3; break;
-                       case 3: s = stemp.target4; break;
+                       case 0: s = this.target; break;
+                       case 1: s = this.target2; break;
+                       case 2: s = this.target3; break;
+                       case 3: s = this.target4; break;
                }
                if (s != "")
                {
@@ -215,7 +214,7 @@ void SUB_UseTargets()
                        for(t = world; (t = find(t, targetname, s)); )
                        if(t.use)
                        {
-                               if(stemp.target_random)
+                               if(this.target_random)
                                {
                                        RandomSelection_Add(t, 0, string_null, 1, 0);
                                }
@@ -224,7 +223,7 @@ void SUB_UseTargets()
                                        if (t.classname == "func_clientwall" || t.classname == "func_clientillusionary")
                                                t.antiwall_flag = aw_flag;
                                        setself(t);
-                                       other = stemp;
+                                       other = this;
                                        activator = act;
                                        self.use();
                                }
@@ -232,16 +231,16 @@ void SUB_UseTargets()
                }
        }
 
-       if(stemp.target_random && RandomSelection_chosen_ent)
+       if(this.target_random && RandomSelection_chosen_ent)
        {
                setself(RandomSelection_chosen_ent);
-               other = stemp;
+               other = this;
                activator = act;
                self.use();
        }
 
        activator = act;
-       setself(stemp);
+       setself(this);
        other = otemp;
 }