Merge branch 'TimePath/killself' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / func / pendulum.qc

diff --git a/qcsrc/common/triggers/func/pendulum.qc b/qcsrc/common/triggers/func/pendulum.qc
index bcfc6e886ce6c6334bd8f1b52a5125384a255512..e05b2a6fca08927c0e081f9e1e230a70ad1a0c45 100644 (file)
--- a/qcsrc/common/triggers/func/pendulum.qc
+++ b/qcsrc/common/triggers/func/pendulum.qc
@@ -1,7 +1,7 @@
 #ifdef SVQC
 .float freq;
-void func_pendulum_controller_think()
-{SELFPARAM();
+void func_pendulum_controller_think(entity this)
+{
        float v;
        self.nextthink = time + 0.1;
 
@@ -67,7 +67,7 @@ spawnfunc(func_pendulum)
        controller.nextthink = time + 1;
        setthink(controller, func_pendulum_controller_think);
        this.nextthink = this.SUB_LTIME + 999999999;
-       this.SUB_THINK = SUB_NullThink; // for PushMove
+       SUB_THINK(this, SUB_NullThink); // for PushMove
 
        //this.effects |= EF_LOWPRECISION;