From: Mario <mario.mario@y7mail.com>
Date: Sun, 15 Sep 2013 07:24:55 +0000 (+1000)
Subject: Fix frozen monsters falling into the floor
X-Git-Tag: xonotic-v0.8.0~241^2^2~78
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=58c43ebd158e8423fd17b85a21c520a1cc89476f;p=xonotic%2Fxonotic-data.pk3dir.git

Fix frozen monsters falling into the floor
---

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index eb8dd33c7..fe2f0a40f 100644
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -539,10 +539,16 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
 		self.SendFlags |= MSF_STATUS;
 
 		movelib_beak_simple(stopspeed);
+		
+		monsters_setframe(manim_idle);
 
-		self.velocity = '0 0 0';
+		if(vlen(self.velocity) > 0)
+		{
+			self.velocity = '0 0 0';
+			self.SendFlags |= MSF_MOVE;
+		}
 		self.enemy = world;
-		self.nextthink = time + 0.1;
+		self.nextthink = time + self.ticrate;
 
 		if(self.revive_progress >= 1)
 			Unfreeze(self); // wait for next think before attacking