From: Mario <mario.mario@y7mail.com>
Date: Sun, 16 Jun 2013 05:01:43 +0000 (+1000)
Subject: Fix monster gravity
X-Git-Tag: xonotic-v0.8.0~241^2^2~181
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3319f759f0100be8459754246d4eee70da461300;p=xonotic%2Fxonotic-data.pk3dir.git

Fix monster gravity
---

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index 8a3c1d32c..9bc60b951 100644
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -1023,6 +1023,7 @@ float monster_initialize(string  net_name, float mon_id,
 	self.deadflag			= DEAD_NO; // UNDEAD
 	self.noalign			= nodrop;
 	self.spawn_time			= time;
+	self.gravity			= 1;
 	self.dphitcontentsmask 	= DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_BOTCLIP | DPCONTENTS_MONSTERCLIP;
 	
 	if not(self.attack_range)
diff --git a/qcsrc/server/movelib.qc b/qcsrc/server/movelib.qc
index 633b07609..b8f46b534 100644
--- 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){