From: Mario <mario.mario@y7mail.com>
Date: Thu, 7 Feb 2013 06:21:30 +0000 (+1100)
Subject: Face owner while idle
X-Git-Tag: xonotic-v0.8.0~241^2^2~536
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d11ea085c19421bf23b53f2cdcf2a8bc80423e44;p=xonotic%2Fxonotic-data.pk3dir.git

Face owner while idle
---

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index 684461a46..c010c2ecc 100644
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -486,6 +486,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);
 	self.angles_y = angles_face_y;
 	
 	if(self.state == MONSTER_STATE_ATTACK_LEAP && (self.flags & FL_ONGROUND))
@@ -522,7 +523,7 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
 		if (vlen(self.velocity) <= 30)
 		{
 			self.frame = manim_idle;
-			self.angles_y = self.pos2_y; // reset looking angle now?
+			self.angles_y = ((self.monster_owner) ? owner_face_y : self.pos2_y); // reset looking angle now?
 		}
 	}
 		
@@ -703,10 +704,11 @@ float monster_initialize(string  net_name,
 		self.netname = ((net_name == "") ? self.classname : net_name);
 	}
 	
+	if not(self.scale)
+		self.scale = 1;
+	
 	if(self.spawnflags & MONSTERFLAG_GIANT && !autocvar_g_monsters_nogiants)
 		ScaleMonster(5);
-	else if(!self.scale)
-		ScaleMonster(1);
 	else
 		ScaleMonster(self.scale);