Cleanse steerlib and movelib of self

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / physics / movelib.qh

diff --git a/qcsrc/common/physics/movelib.qh b/qcsrc/common/physics/movelib.qh
index c1fd574ca036ea0c6629d0eb5c07c42535392a6d..a64651b30e092dd2939cb513bcab941744d0ba35 100644 (file)
--- a/qcsrc/common/physics/movelib.qh
+++ b/qcsrc/common/physics/movelib.qh
@@ -8,7 +8,7 @@
     Simulate drag
     self.velocity = movelib_dragvec(self.velocity,0.02,0.5);
 **/
-vector movelib_dragvec(float drag, float exp_);
+vector movelib_dragvec(entity this, float drag, float exp_);
 
 /**
     Simulate drag
@@ -21,12 +21,12 @@ float movelib_dragflt(float fspeed,float drag,float exp_);
     Basicaly, this allows you to simulate loss of steering with higher speed.
     self.velocity = movelib_inertmove_byspeed(self.velocity,newvel,1000,0.1,0.9);
 **/
-vector movelib_inertmove_byspeed(vector vel_new, float vel_max,float newmin,float oldmax);
+vector movelib_inertmove_byspeed(entity this, vector vel_new, float vel_max, float newmin, float oldmax);
 
-vector movelib_inertmove(vector new_vel,float new_bias);
+vector movelib_inertmove(entity this, vector new_vel, float new_bias);
 
 .float  movelib_lastupdate;
-void movelib_move(vector force,float max_velocity,float drag,float theMass,float breakforce);
+void movelib_move(entity this, vector force, float max_velocity, float drag, float theMass, float breakforce);
 
 /*
 void movelib_move_simple(vector newdir,float velo,float blendrate)
@@ -34,13 +34,13 @@ void movelib_move_simple(vector newdir,float velo,float blendrate)
     self.velocity = self.velocity * (1 - blendrate) + (newdir * blendrate) * velo;
 }
 */
-#define movelib_move_simple(newdir,velo,blendrate) \
-    self.velocity = self.velocity * (1 - blendrate) + (newdir * blendrate) * velo
+#define movelib_move_simple(e,newdir,velo,blendrate) \
+    e.velocity = e.velocity * (1 - blendrate) + (newdir * blendrate) * velo
 
-#define movelib_move_simple_gravity(newdir,velo,blendrate) \
-    if(self.flags & FL_ONGROUND) movelib_move_simple(newdir,velo,blendrate)
+#define movelib_move_simple_gravity(e,newdir,velo,blendrate) \
+    if(IS_ONGROUND(e)) movelib_move_simple(e,newdir,velo,blendrate)
 
-void movelib_brake_simple(float force);
+void movelib_brake_simple(entity this, float force);
 
 /**
 Pitches and rolls the entity to match the gound.
@@ -48,6 +48,6 @@ Yed need to set v_up and v_forward (generally by calling makevectors) before cal
 **/
 #endif
 
-void movelib_groundalign4point(float spring_length, float spring_up, float blendrate, float _max);
+void movelib_groundalign4point(entity this, float spring_length, float spring_up, float blendrate, float _max);
 
 #endif