From: Mario <mario.mario@y7mail.com>
Date: Fri, 1 Mar 2013 14:44:06 +0000 (+1100)
Subject: Fix monsters changing their target while fighting
X-Git-Tag: xonotic-v0.8.0~241^2^2~497
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c1c761e985d714f32a7327b528e3bb515d9e08aa;p=xonotic%2Fxonotic-data.pk3dir.git

Fix monsters changing their target while fighting
---

diff --git a/qcsrc/server/mutators/gamemode_td.qc b/qcsrc/server/mutators/gamemode_td.qc
index e0c9d9c7e..5ce43b0db 100644
--- a/qcsrc/server/mutators/gamemode_td.qc
+++ b/qcsrc/server/mutators/gamemode_td.qc
@@ -791,6 +791,7 @@ MUTATOR_HOOKFUNCTION(td_MonsterMove)
 		return FALSE;
 	}
 	
+	if not(self.enemy) // don't change targets while attacking
 	if((vlen(self.goalentity.origin - self.origin) <= 100 && self.goalentity.classname == "td_waypoint") || (vlen(self.goalentity.origin - self.origin) <= 200 && self.flags & FL_FLY && self.goalentity.classname == "td_waypoint"))
 	{
 		if(self.goalentity.target2)
@@ -804,11 +805,11 @@ MUTATOR_HOOKFUNCTION(td_MonsterMove)
 			self.target = self.goalentity.target;
 				
 		self.goalentity = find(world, targetname, self.target);
+		
+		if(self.goalentity == world)
+			self.goalentity = PickGenerator();
 	}
 	
-	if(self.goalentity == world)
-		self.goalentity = PickGenerator();
-	
 	monster_speed_run = m_speed_run * monster_skill;
 	monster_speed_walk = m_speed_walk * monster_skill;