From: Mario <mario.mario@y7mail.com>
Date: Wed, 17 Apr 2013 04:15:04 +0000 (+1000)
Subject: Fix monsters glitching when match ends & partially fix monsters not selecting a new... 
X-Git-Tag: xonotic-v0.8.0~241^2^2~383
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8bdd77f247eca7eac04fbc1487d6f24d034084a1;p=xonotic%2Fxonotic-data.pk3dir.git

Fix monsters glitching when match ends & partially fix monsters not selecting a new target when wandering around
---

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index 453cef936..f6a0e119a 100644
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -539,6 +539,7 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
 		runspeed = walkspeed = 0;
 		monsters_setframe(manim_idle);
 		movelib_beak_simple(stopspeed);
+		self.SendFlags |= MSF_MOVE;
 		return;
 	}
 	
@@ -613,16 +614,23 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
 	}
 	else
 	{
-		movelib_beak_simple(stopspeed);
-		if(time > self.attack_finished_single)
-		if(time > self.pain_finished)
-		if (vlen(self.velocity) <= 30)
+		if(self.goalentity.target)
+			self.target2 = self.goalentity.target;
+		else if(self.goalentity.target2)
+			self.target2 = self.goalentity.target2;
+		else
 		{
-			monsters_setframe(manim_idle);
-			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?
+			movelib_beak_simple(stopspeed);
+			if(time > self.attack_finished_single)
+			if(time > self.pain_finished)
+			if (vlen(self.velocity) <= 30)
+			{
+				monsters_setframe(manim_idle);
+				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?
+			}
 		}
 	}