From 2f52f32d92695bbaf8ed4831117b39c81dc0b89b Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 2 Mar 2013 01:32:32 +1100 Subject: [PATCH] Fix monsters not choosing target2 as a valid path --- qcsrc/server/monsters/lib/monsters.qc | 11 ----------- qcsrc/server/mutators/gamemode_td.qc | 8 ++++---- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc index 8e0317dc9..5a24762b3 100644 --- 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 177e7036c..e0c9d9c7e 100644 --- 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(); -- 2.39.2