]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Use a new function for movement
authorMario <mario.mario@y7mail.com>
Wed, 2 Oct 2013 05:05:52 +0000 (22:05 -0700)
committerMario <mario.mario@y7mail.com>
Wed, 2 Oct 2013 05:05:52 +0000 (22:05 -0700)
qcsrc/common/monsters/sv_monsters.qc
qcsrc/server/movelib.qc

index 05e8ab34ba6f243d199137033ebb51d1970694f5..514c0fb580a57be25c92fe043e9ccd82faa06758 100644 (file)
@@ -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)
index 9b9f7fde01abe5dc22dcd51310665c265aa15e6d..4b2eaa1b706b7bcedbb1d42e7508fd0f07fda2cb 100644 (file)
@@ -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)
 {