Teams: setteam

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

diff --git a/qcsrc/common/triggers/trigger/multi.qc b/qcsrc/common/triggers/trigger/multi.qc
index 500f8f32f8f5f251d13bbedccd0f16c45d23ca84..950a69d1d0d92bae02338dbf1baab0925fccd10a 100644 (file)
--- a/qcsrc/common/triggers/trigger/multi.qc
+++ b/qcsrc/common/triggers/trigger/multi.qc
@@ -127,7 +127,7 @@ void multi_reset(entity this)
        }
        this.think = func_null;
        this.nextthink = 0;
-       this.team = this.team_saved;
+       setteam(this, this.team_saved);
 }
 
 /*QUAKED spawnfunc_trigger_multiple (.5 .5 .5) ? notouch
@@ -147,19 +147,14 @@ spawnfunc(trigger_multiple)
 {
        self.reset = multi_reset;
        if (self.sounds == 1)
-       {
-               precache_sound ("misc/secret.wav");
                self.noise = "misc/secret.wav";
-       }
        else if (self.sounds == 2)
-       {
                self.noise = strzone(SND(TALK));
-       }
        else if (self.sounds == 3)
-       {
-               precache_sound ("misc/trigger1.wav");
                self.noise = "misc/trigger1.wav";
-       }
+
+       if(self.noise)
+               precache_sound(self.noise);
 
        if (!self.wait)
                self.wait = 0.2;
@@ -169,7 +164,7 @@ spawnfunc(trigger_multiple)
 
        EXACTTRIGGER_INIT;
 
-       self.team_saved = self.team;
+       self.team_saved = TMID(self.team);
 
        if (self.health)
        {