Fix monsters changing their target while fighting

diff --git a/qcsrc/server/mutators/gamemode_td.qc b/qcsrc/server/mutators/gamemode_td.qc
index e0c9d9c7edfc4cba7f6ed8e078a3d8a6b4eb824a..5ce43b0dbbf125d67d4b509b62175f3ed95f9cf4 100644 (file)
--- 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;