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

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

diff --git a/qcsrc/common/triggers/trigger/monoflop.qc b/qcsrc/common/triggers/trigger/monoflop.qc
index 994d498c11e8b0a43056979fccd29ee5430542e7..a67baca16a2f152d69877823eee144bfd076724a 100644 (file)
--- a/qcsrc/common/triggers/trigger/monoflop.qc
+++ b/qcsrc/common/triggers/trigger/monoflop.qc
@@ -1,3 +1,4 @@
+#include "monoflop.qh"
 #ifdef SVQC
 /*QUAKED spawnfunc_trigger_monoflop (.5 .5 .5) (-8 -8 -8) (8 8 8)
 "Mono-flop" trigger gate... turns one trigger event into one "on" and one "off" event, separated by a delay of "wait"
@@ -21,8 +22,8 @@ void monoflop_fixed_use(entity this, entity actor, entity trigger)
        SUB_UseTargets(this, actor, trigger);
 }
 
-void monoflop_think()
-{SELFPARAM();
+void monoflop_think(entity this)
+{
        this.state = 0;
        SUB_UseTargets(this, this.enemy, NULL);
 }
@@ -41,7 +42,7 @@ spawnfunc(trigger_monoflop)
                this.use = monoflop_fixed_use;
        else
                this.use = monoflop_use;
-       this.think = monoflop_think;
+       setthink(this, monoflop_think);
        this.state = 0;
        this.reset = monoflop_reset;
 }