Merge branch 'master' into terencehill/infomessages_panel_update

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

diff --git a/qcsrc/common/triggers/subs.qc b/qcsrc/common/triggers/subs.qc
index a71267b0cc5d047d59b01d2e30d739e23421250c..51ef002736a32201d391cc9831b9a4f84f06389f 100644 (file)
--- a/qcsrc/common/triggers/subs.qc
+++ b/qcsrc/common/triggers/subs.qc
@@ -145,7 +145,7 @@ void SUB_CalcMove_controller_think (entity this)
                entity own = this.owner;
                SUB_THINK(own, this.think1);
                remove(this);
-               WITHSELF(own, SUB_THUNK(own)(own));
+               SUB_THUNK(own)(own);
        }
 }
 
@@ -236,7 +236,7 @@ void SUB_CalcMove_Bezier (entity this, vector tcontrol, vector tdest, float tspe
        this.SUB_NEXTTHINK = this.SUB_LTIME + traveltime;
 
        // invoke controller
-       WITHSELF(controller, getthink(controller)(controller));
+       getthink(controller)(controller);
 }
 
 void SUB_CalcMove (entity this, vector tdest, float tspeedtype, float tspeed, void(entity this) func)