From: Mario <mario.mario@y7mail.com>
Date: Sun, 2 Jun 2013 10:55:00 +0000 (+1000)
Subject: Don't update monster angles if it's attacking
X-Git-Tag: xonotic-v0.8.0~241^2^2~210
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=315c958d410941c156a533c827a88ecce6aea73f;p=xonotic%2Fxonotic-data.pk3dir.git

Don't update monster angles if it's attacking
---

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index 122b0de27..d0aefc905 100644
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -601,7 +601,7 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
 	if(!(self.flags & FL_FLY || self.flags & FL_SWIM))
 		self.moveto_z = self.origin_z;
 	
-	if(self.state != MONSTER_STATE_ATTACK_LEAP)
+	if(self.state != MONSTER_STATE_ATTACK_LEAP && self.state != MONSTER_STATE_ATTACK_MELEE)
 		self.angles_y = angles_face_y;
 	
 	if(self.state == MONSTER_STATE_ATTACK_LEAP && (self.flags & FL_ONGROUND))
@@ -644,6 +644,7 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
 			if (vlen(self.velocity) <= 30)
 			{
 				monsters_setframe(manim_idle);
+				if(self.state != MONSTER_STATE_ATTACK_MELEE)
 				if(self.enemy)
 					self.angles_y = enemy_face_y;
 				else
diff --git a/qcsrc/server/monsters/monster/shambler.qc b/qcsrc/server/monsters/monster/shambler.qc
index 7e4433ca1..15d4d14db 100644
--- a/qcsrc/server/monsters/monster/shambler.qc
+++ b/qcsrc/server/monsters/monster/shambler.qc
@@ -70,7 +70,7 @@ void CastLightning ()
 	self.monster_delayedattack = func_null;
 	self.delay = -1;
 
-	local vector org = '0 0 0', dir = '0 0 0';
+	local vector org, dir;
 	//vector v = '0 0 0';
 
 	self.effects |= EF_MUZZLEFLASH;