Merge branch 'master' into Mario/target_teleporter_v2

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

diff --git a/qcsrc/common/triggers/trigger/disablerelay.qc b/qcsrc/common/triggers/trigger/disablerelay.qc
index 4545df19575afe5e4c17015c7feedc258e1908b7..eee61c993535f063b5ba30eeccdd6db3550b0273 100644 (file)
--- a/qcsrc/common/triggers/trigger/disablerelay.qc
+++ b/qcsrc/common/triggers/trigger/disablerelay.qc
@@ -1,12 +1,10 @@
+#include "disablerelay.qh"
 #ifdef SVQC
-void trigger_disablerelay_use()
-{SELFPARAM();
-       entity e;
+void trigger_disablerelay_use(entity this, entity actor, entity trigger)
+{
+       int a = 0, b = 0;
 
-       float a, b;
-       a = b = 0;
-
-       for(e = world; (e = find(e, targetname, self.target)); )
+       for(entity e = NULL; (e = find(e, targetname, this.target)); )
        {
                if(e.use == SUB_UseTargets)
                {
@@ -21,11 +19,11 @@ void trigger_disablerelay_use()
        }
 
        if((!a) == (!b))
-               LOG_INFO("Invalid use of trigger_disablerelay: ", ftos(a), " relays were on, ", ftos(b), " relays were off!\n");
+               LOG_INFO("Invalid use of trigger_disablerelay: ", ftos(a), " relays were on, ", ftos(b), " relays were off!");
 }
 
-void spawnfunc_trigger_disablerelay()
-{SELFPARAM();
-       self.use = trigger_disablerelay_use;
+spawnfunc(trigger_disablerelay)
+{
+       this.use = trigger_disablerelay_use;
 }
 #endif