Merge branch 'master' into Mario/qc_updates

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / movelib.qc

diff --git a/qcsrc/server/movelib.qc b/qcsrc/server/movelib.qc
index 66c13162f4a9c667f0b4c38eb977e0dd85e509b7..994849f5572cfa712148705297c363cf48cbf079 100644 (file)
--- a/qcsrc/server/movelib.qc
+++ b/qcsrc/server/movelib.qc
@@ -1,3 +1,5 @@
+#include "movelib.qh"
+
 #ifdef SVQC
 .vector moveto;
 
@@ -53,7 +55,6 @@ vector movelib_inertmove(vector new_vel,float new_bias)
     return new_vel * new_bias + self.velocity * (1-new_bias);
 }
 
-.float  movelib_lastupdate;
 void movelib_move(vector force,float max_velocity,float drag,float theMass,float breakforce)
 {
     float deltatime;
@@ -162,18 +163,6 @@ void movelib_update(vector dir,float force)
 }
 */
 
-/*
-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_gravity(newdir,velo,blendrate) \
-    if(self.flags & FL_ONGROUND) movelib_move_simple(newdir,velo,blendrate)
-
 void movelib_beak_simple(float force)
 {
     float mspeed;
@@ -197,7 +186,7 @@ void movelib_groundalign4point(float spring_length, float spring_up, float blend
 {
     vector a, b, c, d, e, r, push_angle, ahead, side;
 
-    push_angle_y = 0;
+    push_angle.y = 0;
     r = (self.absmax + self.absmin) * 0.5 + (v_up * spring_up);
     e = v_up * spring_length;
 
@@ -211,29 +200,29 @@ void movelib_groundalign4point(float spring_length, float spring_up, float blend
     d = r - ahead - side;
 
     traceline(a, a - e,MOVE_NORMAL,self);
-    a_z =  (1 - trace_fraction);
+    a.z =  (1 - trace_fraction);
     r = trace_endpos;
 
     traceline(b, b - e,MOVE_NORMAL,self);
-    b_z =  (1 - trace_fraction);
+    b.z =  (1 - trace_fraction);
     r += trace_endpos;
 
     traceline(c, c - e,MOVE_NORMAL,self);
-    c_z =  (1 - trace_fraction);
+    c.z =  (1 - trace_fraction);
     r += trace_endpos;
 
     traceline(d, d - e,MOVE_NORMAL,self);
-    d_z =  (1 - trace_fraction);
+    d.z =  (1 - trace_fraction);
     r += trace_endpos;
 
-    a_x = r.z;
+    a.x = r.z;
     r = self.origin;
-    r_z = r.z;
+    r.z = r.z;
 
-    push_angle_x = (a.z - c.z) * _max;
+    push_angle.x = (a.z - c.z) * _max;
     push_angle.x += (b.z - d.z) * _max;
 
-    push_angle_z = (b.z - a.z) * _max;
+    push_angle.z = (b.z - a.z) * _max;
     push_angle.z += (d.z - c.z) * _max;
 
     //self.angles_x += push_angle_x * 0.95;