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 137213f34aa7a6b775586b4f45cab6b71b77caa9..eee61c993535f063b5ba30eeccdd6db3550b0273 100644 (file)
--- a/qcsrc/common/triggers/trigger/disablerelay.qc
+++ b/qcsrc/common/triggers/trigger/disablerelay.qc
@@ -1,28 +1,29 @@
+#include "disablerelay.qh"
 #ifdef SVQC
 void trigger_disablerelay_use(entity this, entity actor, entity trigger)
 {
        int a = 0, b = 0;
 
-       for(entity e = world; (e = find(e, targetname, this.target)); )
+       for(entity e = NULL; (e = find(e, targetname, this.target)); )
        {
-               if(e.use1 == SUB_UseTargets)
+               if(e.use == SUB_UseTargets)
                {
-                       e.use1 = SUB_DontUseTargets;
+                       e.use = SUB_DontUseTargets;
                        ++a;
                }
-               else if(e.use1 == SUB_DontUseTargets)
+               else if(e.use == SUB_DontUseTargets)
                {
-                       e.use1 = SUB_UseTargets;
+                       e.use = SUB_UseTargets;
                        ++b;
                }
        }
 
        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!");
 }
 
 spawnfunc(trigger_disablerelay)
 {
-       this.use1 = trigger_disablerelay_use;
+       this.use = trigger_disablerelay_use;
 }
 #endif