Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/server/movelib.qc b/qcsrc/server/movelib.qc
index de82b16a8ab1f793623514e24cb38639430deb4f..c262d0152e23bb9c1ad88b39dad2c51ddce3681e 100644 (file)
--- a/qcsrc/server/movelib.qc
+++ b/qcsrc/server/movelib.qc
@@ -170,6 +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) movelib_move_simple(newdir,velo,blendrate)
 
 void movelib_beak_simple(float force)
 {