Merge branch 'martin-t/warns' into 'master'

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

diff --git a/qcsrc/common/triggers/trigger/delay.qc b/qcsrc/common/triggers/trigger/delay.qc
index a3e08e4d81f9f522a17008b82ee21e1a787c43aa..2cd4cfd1338ac0809f3f9ff451a65ee3f5a59f8d 100644 (file)
--- a/qcsrc/common/triggers/trigger/delay.qc
+++ b/qcsrc/common/triggers/trigger/delay.qc
@@ -1,22 +1,32 @@
+#include "delay.qh"
 #ifdef SVQC
-void delay_use()
-{SELFPARAM();
-    self.think = SUB_UseTargets;
-   self.nextthink = self.wait;
+void delay_delayeduse(entity this)
+{
+       SUB_UseTargets(this, this.enemy, this.goalentity);
+       this.enemy = this.goalentity = NULL;
 }
 
-void delay_reset()
-{SELFPARAM();
-       self.think = func_null;
-       self.nextthink = 0;
+void delay_use(entity this, entity actor, entity trigger)
+{
+       this.enemy = actor;
+       this.goalentity = trigger;
+       setthink(this, delay_delayeduse);
+       this.nextthink = time + this.wait;
 }
 
-void spawnfunc_trigger_delay()
-{SELFPARAM();
-    if(!self.wait)
-        self.wait = 1;
+void delay_reset(entity this)
+{
+       this.enemy = this.goalentity = NULL;
+       setthink(this, func_null);
+       this.nextthink = 0;
+}
+
+spawnfunc(trigger_delay)
+{
+    if(!this.wait)
+        this.wait = 1;
 
-    self.use = delay_use;
-    self.reset = delay_reset;
+    this.use = delay_use;
+    this.reset = delay_reset;
 }
 #endif