Merge branch 'master' into samual/weapons

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

diff --git a/qcsrc/server/movelib.qc b/qcsrc/server/movelib.qc
index 4b2eaa1b706b7bcedbb1d42e7508fd0f07fda2cb..0774dd1dc7037de88324db2bd2698aa0df088863 100644 (file)
--- a/qcsrc/server/movelib.qc
+++ b/qcsrc/server/movelib.qc
@@ -1,4 +1,4 @@
-#ifdef SVQC 
+#ifdef SVQC
 .vector moveto;
 
 /**
@@ -170,9 +170,9 @@ void movelib_move_simple(vector newdir,float velo,float blendrate)
 */
 #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) self.velocity = self.velocity * (1 - blendrate) + (newdir * blendrate) * velo
+    if(self.flags & FL_ONGROUND) movelib_move_simple(newdir,velo,blendrate)
 
 void movelib_beak_simple(float force)
 {