Merge branch 'terencehill/v_deathtilt_fix' 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 4c0e27c7563769bbe94a0313bbce3b3226e3231e..018e20884b25938e7d17fba6fc0764948c2aad1d 100644 (file)
--- a/qcsrc/common/triggers/trigger/monoflop.qc
+++ b/qcsrc/common/triggers/trigger/monoflop.qc
@@ -21,8 +21,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);
 }
@@ -38,10 +38,10 @@ spawnfunc(trigger_monoflop)
        if(!this.wait)
                this.wait = 1;
        if(this.spawnflags & 1)
-               this.use1 = monoflop_fixed_use;
+               this.use = monoflop_fixed_use;
        else
-               this.use1 = monoflop_use;
-       this.think = monoflop_think;
+               this.use = monoflop_use;
+       setthink(this, monoflop_think);
        this.state = 0;
        this.reset = monoflop_reset;
 }