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 633b0760917fa7438a592c1769140638ccf82e14..b8f46b534dd5c09c0da8331f4ff9325e62b8c279 100644 (file)
--- a/qcsrc/server/movelib.qc
+++ b/qcsrc/server/movelib.qc
@@ -107,7 +107,7 @@ 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.velocity_z = z_speed * self.gravity;
 }
 
 void movelib_jump_simple(float power){