X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmovelib.qc;h=0774dd1dc7037de88324db2bd2698aa0df088863;hb=f8287888da112f1cd5d711903be8f840ff9f0d70;hp=b8f46b534dd5c09c0da8331f4ff9325e62b8c279;hpb=1f988ad58a9fb5cef7ed843ad839b23dd23f6dc9;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/movelib.qc b/qcsrc/server/movelib.qc
index b8f46b534..0774dd1dc 100644
--- a/qcsrc/server/movelib.qc
+++ b/qcsrc/server/movelib.qc
@@ -1,4 +1,4 @@
-#ifdef SVQC 
+#ifdef SVQC
 .vector moveto;
 
 /**
@@ -102,19 +102,6 @@ void movelib_move(vector force,float max_velocity,float drag,float theMass,float
             self.velocity = normalize(self.velocity) * (mspeed - 50);//* max_velocity;
 }
 
-void movelib_move_simple_gravity(vector newdir,float velo,float blendrate)
-{
-    float z_speed = self.velocity_z;
-    self.movelib_lastupdate = time;
-    self.velocity = self.velocity * (1 - blendrate) + (newdir * blendrate) * velo;
-    self.velocity_z = z_speed * self.gravity;
-}
-
-void movelib_jump_simple(float power){
-    self.velocity_z=power;
-    self.movelib_lastupdate = time;
-}
-
 /*
 .float mass;
 .float side_friction;
@@ -184,6 +171,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)
 {
     float mspeed;