From: Mario <mario.mario@y7mail.com>
Date: Tue, 5 Mar 2013 18:24:00 +0000 (+1100)
Subject: Don't face owner if the monster has an enemy
X-Git-Tag: xonotic-v0.8.0~241^2^2~479
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d705220de721c8996efe7aed463abb0757ad3f7b;p=xonotic%2Fxonotic-data.pk3dir.git

Don't face owner if the monster has an enemy
---

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index 3b01e68d2..5bb995f57 100644
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -557,6 +557,7 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
 	
 	vector angles_face = vectoangles(self.moveto - self.origin);
 	vector owner_face = vectoangles(self.monster_owner.origin - self.origin);
+	vector enemy_face = vectoangles(self.enemy.origin - self.origin);
 	self.angles_y = angles_face_y;
 	
 	if(self.state == MONSTER_STATE_ATTACK_LEAP && (self.flags & FL_ONGROUND))
@@ -593,7 +594,10 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
 		if (vlen(self.velocity) <= 30)
 		{
 			self.frame = manim_idle;
-			self.angles_y = ((self.monster_owner) ? owner_face_y : self.pos2_y); // reset looking angle now?
+			if(self.enemy)
+				self.angles_y = enemy_face_y;
+			else
+				self.angles_y = ((self.monster_owner) ? owner_face_y : self.pos2_y); // reset looking angle now?
 		}
 	}