Merge branch 'master' into terencehill/hud_shake_fix

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

diff --git a/qcsrc/common/triggers/trigger/keylock.qc b/qcsrc/common/triggers/trigger/keylock.qc
index c8ff29cb7b4542b3f8add136b222f1bdd0b9df0a..133397876857999c1eecad47467b8a09fa86e8e1 100644 (file)
--- a/qcsrc/common/triggers/trigger/keylock.qc
+++ b/qcsrc/common/triggers/trigger/keylock.qc
@@ -3,7 +3,7 @@
  */
 void trigger_keylock_trigger(entity this, entity actor, string s)
 {
-       for(entity t = world; (t = find(t, targetname, s)); )
+       for(entity t = NULL; (t = find(t, targetname, s)); )
                if(t.use)
                        t.use(t, actor, this);
 }
@@ -14,7 +14,7 @@ void trigger_keylock_trigger(entity this, entity actor, string s)
 void trigger_keylock_kill(string s)
 {
        entity t;
-       for(t = world; (t = find(t, targetname, s)); )
+       for(t = NULL; (t = find(t, targetname, s)); )
                remove(t);
 }