Fix monsters not choosing target2 as a valid path

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index 8e0317dc9841011271d425673541e13778045208..5a24762b387e1a464a6f2f83c84abae8144d98b0 100644 (file)
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -537,17 +537,6 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
        }
        else
        {
-               if(self.goalentity && self.goalentity.target != "" && self.enemy == world)
-               {
-                       if(self.goalentity.target2 != "")
-                               if(random() > 0.5)
-                                       self.target = self.goalentity.target2;
-                               else
-                                       self.target = self.goalentity.target;
-                       else
-                               self.target = self.goalentity.target; // handled next think frame
-               }
-                       
                movelib_beak_simple(stopspeed);
                if(time > self.attack_finished_single)
                if(time > self.pain_finished)

diff --git a/qcsrc/server/mutators/gamemode_td.qc b/qcsrc/server/mutators/gamemode_td.qc
index 177e7036c959743161a8b2b5f64bf0a6386d2a7f..e0c9d9c7edfc4cba7f6ed8e078a3d8a6b4eb824a 100644 (file)
--- a/qcsrc/server/mutators/gamemode_td.qc
+++ b/qcsrc/server/mutators/gamemode_td.qc
@@ -790,10 +790,10 @@ MUTATOR_HOOKFUNCTION(td_MonsterMove)
                monster_speed_run = monster_speed_walk = 0;
                return FALSE;
        }
-       /*
+       
        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 != "")
+               if(self.goalentity.target2)
                {
                        if(random() > 0.5)
                                self.target = self.goalentity.target2;
@@ -802,9 +802,9 @@ MUTATOR_HOOKFUNCTION(td_MonsterMove)
                }
                else
                        self.target = self.goalentity.target;
-                       
+                               
                self.goalentity = find(world, targetname, self.target);
-       } */
+       }
        
        if(self.goalentity == world)
                self.goalentity = PickGenerator();