Merge branch 'master' into terencehill/min_spec_time

[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 e90eb1853affc2dc4e51097b1889980af8f07853..67db14421662c2d0c40483b328ee3dd30ee6babe 100644 (file)
--- a/qcsrc/common/triggers/trigger/keylock.qc
+++ b/qcsrc/common/triggers/trigger/keylock.qc
@@ -1,9 +1,10 @@
+#include "keylock.qh"
 /**
  * trigger given targets
  */
 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,67 +15,67 @@ 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)); )
-               remove(t);
+       for(t = NULL; (t = find(t, targetname, s)); )
+               delete(t);
 }
 
-void trigger_keylock_touch(entity this)
+void trigger_keylock_touch(entity this, entity toucher)
 {
        bool key_used = false;
        bool started_delay = false;
 
        // only player may trigger the lock
-       if(!IS_PLAYER(other))
+       if(!IS_PLAYER(toucher))
                return;
 
        // check silver key
-       if(self.itemkeys)
-               key_used = item_keys_usekey(self, other);
+       if(this.itemkeys)
+               key_used = item_keys_usekey(this, toucher);
 
-       if(self.itemkeys)
+       if(this.itemkeys)
        {
 #ifdef SVQC
                // at least one of the keys is missing
                if(key_used)
                {
                        // one or more keys were given, but others are still missing!
-                       play2(other, self.noise1);
-                       Send_Notification(NOTIF_ONE, other, MSG_CENTER, CENTER_DOOR_LOCKED_ALSONEED, item_keys_keylist(self.itemkeys));
-                       other.key_door_messagetime = time + 2;
+                       play2(toucher, this.noise1);
+                       Send_Notification(NOTIF_ONE, toucher, MSG_CENTER, CENTER_DOOR_LOCKED_ALSONEED, item_keys_keylist(this.itemkeys));
+                       toucher.key_door_messagetime = time + 2;
                }
-               else if(other.key_door_messagetime <= time)
+               else if(toucher.key_door_messagetime <= time)
                {
                        // no keys were given
-                       play2(other, self.noise2);
-                       Send_Notification(NOTIF_ONE, other, MSG_CENTER, CENTER_DOOR_LOCKED_NEED, item_keys_keylist(self.itemkeys));
-                       other.key_door_messagetime = time + 2;
+                       play2(toucher, this.noise2);
+                       Send_Notification(NOTIF_ONE, toucher, MSG_CENTER, CENTER_DOOR_LOCKED_NEED, item_keys_keylist(this.itemkeys));
+                       toucher.key_door_messagetime = time + 2;
                }
 #endif
 
                // trigger target2
-               if(self.delay <= time || started_delay == true)
-               if(self.target2)
+               if(this.delay <= time || started_delay == true)
+               if(this.target2)
                {
-                       trigger_keylock_trigger(this, other, self.target2);
+                       trigger_keylock_trigger(this, toucher, this.target2);
                        started_delay = true;
-                       self.delay = time + self.wait;
+                       this.delay = time + this.wait;
                }
        }
        else
        {
 #ifdef SVQC
                // all keys were given!
-               play2(other, self.noise);
-               centerprint(other, self.message);
+               play2(toucher, this.noise);
+               centerprint(toucher, this.message);
 #endif
 
-               if(self.target)
-                       trigger_keylock_trigger(this, other, self.target);
+               if(this.target)
+                       trigger_keylock_trigger(this, toucher, this.target);
 
-               if(self.killtarget)
-                       trigger_keylock_kill(self.killtarget);
+               if(this.killtarget)
+                       trigger_keylock_kill(this.killtarget);
 
-               remove(self);
+               delete(this);
        }
 
 }
@@ -121,7 +122,7 @@ message2 and noise2 will be resent to the player every 2 seconds while he is in
 */
 spawnfunc(trigger_keylock)
 {
-       if(!this.itemkeys) { remove(this); return; }
+       if(!this.itemkeys) { delete(this); return; }
 
        // set unlocked message
        if(this.message == "")
@@ -163,23 +164,12 @@ spawnfunc(trigger_keylock)
 #elif defined(CSQC)
 void keylock_remove(entity this)
 {
-       if(this.target) { strunzone(this.target); }
-       this.target = string_null;
-
-       if(this.target2) { strunzone(this.target2); }
-       this.target2 = string_null;
-
-       if(this.target3) { strunzone(this.target3); }
-       this.target3 = string_null;
-
-       if(this.target4) { strunzone(this.target4); }
-       this.target4 = string_null;
-
-       if(this.killtarget) { strunzone(this.killtarget); }
-       this.killtarget = string_null;
-
-       if(this.targetname) { strunzone(this.targetname); }
-       this.targetname = string_null;
+       strfree(this.target);
+       strfree(this.target2);
+       strfree(this.target3);
+       strfree(this.target4);
+       strfree(this.killtarget);
+       strfree(this.targetname);
 }
 
 NET_HANDLE(ENT_CLIENT_KEYLOCK, bool isnew)