]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix monster gravity
authorMario <mario.mario@y7mail.com>
Sun, 16 Jun 2013 05:01:43 +0000 (15:01 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 16 Jun 2013 05:01:43 +0000 (15:01 +1000)
qcsrc/server/monsters/lib/monsters.qc
qcsrc/server/movelib.qc

index 8a3c1d32cc2161786ed0b75be6c09214340a84e7..9bc60b9517bc1d840074357d9645a47f5a97ed66 100644 (file)
@@ -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)
index 633b0760917fa7438a592c1769140638ccf82e14..b8f46b534dd5c09c0da8331f4ff9325e62b8c279 100644 (file)
@@ -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){