Merge branch 'master' into Mario/fullbright_skins

[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 a1f13d277e5f87e68d3391323596d0d9072cc659..1d30db0e08f919a703a1d11da5d5b35bb0369802 100644 (file)
--- a/qcsrc/common/triggers/trigger/disablerelay.qc
+++ b/qcsrc/common/triggers/trigger/disablerelay.qc
@@ -1,12 +1,9 @@
 #ifdef SVQC
-void trigger_disablerelay_use()
-{SELFPARAM();
-       entity e;
-
-       float a, b;
-       a = b = 0;
+void trigger_disablerelay_use(entity this, entity actor, entity trigger)
+{
+       int a = 0, 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)
                {
@@ -26,6 +23,6 @@ void trigger_disablerelay_use()
 
 spawnfunc(trigger_disablerelay)
 {
-       self.use = trigger_disablerelay_use;
+       this.use = trigger_disablerelay_use;
 }
 #endif