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 c5049da3931f73b8eab4288601d30fd71426d25a..2cd4cfd1338ac0809f3f9ff451a65ee3f5a59f8d 100644 (file)
--- a/qcsrc/common/triggers/trigger/delay.qc
+++ b/qcsrc/common/triggers/trigger/delay.qc
@@ -1,13 +1,22 @@
 #include "delay.qh"
 #ifdef SVQC
+void delay_delayeduse(entity this)
+{
+       SUB_UseTargets(this, this.enemy, this.goalentity);
+       this.enemy = this.goalentity = NULL;
+}
+
 void delay_use(entity this, entity actor, entity trigger)
 {
-   setthink(this, SUB_UseTargets_self);
-   this.nextthink = this.wait;
+       this.enemy = actor;
+       this.goalentity = trigger;
+       setthink(this, delay_delayeduse);
+       this.nextthink = time + this.wait;
 }
 
 void delay_reset(entity this)
 {
+       this.enemy = this.goalentity = NULL;
        setthink(this, func_null);
        this.nextthink = 0;
 }