Merge branch 'master' into Mario/fullbright_skins

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

diff --git a/qcsrc/common/triggers/trigger/relay_teamcheck.qc b/qcsrc/common/triggers/trigger/relay_teamcheck.qc
index f93287a920f4ad2c5a5187d17a03fad951e4b361..2972d32bbf79b3e23fa6da66e4e9569e982a6824 100644 (file)
--- a/qcsrc/common/triggers/trigger/relay_teamcheck.qc
+++ b/qcsrc/common/triggers/trigger/relay_teamcheck.qc
@@ -1,35 +1,35 @@
 #ifdef SVQC
-void trigger_relay_teamcheck_use()
-{SELFPARAM();
-       if(activator.team)
+void trigger_relay_teamcheck_use(entity this, entity actor, entity trigger)
+{
+       if(actor.team)
        {
-               if(self.spawnflags & 2)
+               if(this.spawnflags & 2)
                {
-                       if(DIFF_TEAM(activator, self))
-                               SUB_UseTargets();
+                       if(DIFF_TEAM(actor, this))
+                               SUB_UseTargets(this, actor, trigger);
                }
                else
                {
-                       if(SAME_TEAM(activator, self))
-                               SUB_UseTargets();
+                       if(SAME_TEAM(actor, this))
+                               SUB_UseTargets(this, actor, trigger);
                }
        }
        else
        {
-               if(self.spawnflags & 1)
-                       SUB_UseTargets();
+               if(this.spawnflags & 1)
+                       SUB_UseTargets(this, actor, trigger);
        }
 }
 
-void trigger_relay_teamcheck_reset()
-{SELFPARAM();
-       self.team = self.team_saved;
+void trigger_relay_teamcheck_reset(entity this)
+{
+       this.team = this.team_saved;
 }
 
-void spawnfunc_trigger_relay_teamcheck()
-{SELFPARAM();
-       self.team_saved = self.team;
-       self.use = trigger_relay_teamcheck_use;
-       self.reset = trigger_relay_teamcheck_reset;
+spawnfunc(trigger_relay_teamcheck)
+{
+       this.team_saved = this.team;
+       this.use = trigger_relay_teamcheck_use;
+       this.reset = trigger_relay_teamcheck_reset;
 }
 #endif