Kill the use of self in movetype code, to make it usable from the player physics...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / movetypes / step.qc

diff --git a/qcsrc/common/movetypes/step.qc b/qcsrc/common/movetypes/step.qc
index f4884ba27a23a5137af32c369dade827dc06d282..eec9b4c0965d4b27e640bc29441d503625fca5f7 100644 (file)
--- a/qcsrc/common/movetypes/step.qc
+++ b/qcsrc/common/movetypes/step.qc
@@ -1,23 +1,23 @@
-void _Movetype_Physics_Step(float dt) // SV_Physics_Step
-{SELFPARAM();
-       if(self.move_flags & FL_ONGROUND)
+void _Movetype_Physics_Step(entity this, float dt) // SV_Physics_Step
+{
+       if(this.move_flags & FL_ONGROUND)
        {
-               if(self.velocity_z >= (1.0 / 32.0) && UPWARD_VELOCITY_CLEARS_ONGROUND)
+               if(this.velocity_z >= (1.0 / 32.0) && UPWARD_VELOCITY_CLEARS_ONGROUND)
                {
-                       self.move_flags &= ~FL_ONGROUND;
-                       _Movetype_CheckVelocity();
-                       _Movetype_FlyMove(dt, true, '0 0 0', 0);
-                       _Movetype_LinkEdict(true);
+                       this.move_flags &= ~FL_ONGROUND;
+                       _Movetype_CheckVelocity(this);
+                       _Movetype_FlyMove(this, dt, true, '0 0 0', 0);
+                       _Movetype_LinkEdict(this, true);
                }
        }
        else
        {
-               _Movetype_CheckVelocity();
-               _Movetype_FlyMove(dt, true, '0 0 0', 0);
-               _Movetype_LinkEdict(true);
+               _Movetype_CheckVelocity(this);
+               _Movetype_FlyMove(this, dt, true, '0 0 0', 0);
+               _Movetype_LinkEdict(this, true);
 
                // TODO? movetypesteplandevent
        }
 
-       _Movetype_CheckWaterTransition(self);
+       _Movetype_CheckWaterTransition(this);
 }