From: Mario <mario.mario@y7mail.com>
Date: Wed, 2 Oct 2013 05:05:52 +0000 (-0700)
Subject: Use a new function for movement
X-Git-Tag: xonotic-v0.8.0~241^2^2~60
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=95e6d244a74e5f62b27055efd00563923c2acbbe;p=xonotic%2Fxonotic-data.pk3dir.git

Use a new function for movement
---

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 05e8ab34b..514c0fb58 100644
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -679,7 +679,7 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
 		if(self.flags & FL_FLY || self.flags & FL_SWIM)
 			movelib_move_simple(v_forward, ((self.enemy) ? runspeed : walkspeed), 0.6);
 		else
-			movelib_move(v_forward, ((self.enemy) ? runspeed : walkspeed), 0, 200, 0.6);
+			movelib_move_simple_gravity(v_forward, ((self.enemy) ? runspeed : walkspeed), 0.6);
 
 		if(time > self.pain_finished)
 		if(time > self.attack_finished_single)
diff --git a/qcsrc/server/movelib.qc b/qcsrc/server/movelib.qc
index 9b9f7fde0..4b2eaa1b7 100644
--- 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) self.velocity = self.velocity * (1 - blendrate) + (newdir * blendrate) * velo
 
 void movelib_beak_simple(float force)
 {