Use targ/monster_target instead of goalentity

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index fcfb2e7a7df8ae0b2bf7b8af7f7b940960db1ade..7da1256bb0a190fabe565fad999d951092d45ebf 100644 (file)
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -636,10 +636,10 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
        }
        else
        {
-               if(self.goalentity.target)
-                       self.target2 = self.goalentity.target;
-               else if(self.goalentity.target2)
-                       self.target2 = self.goalentity.target2;
+               if(targ.target)
+                       self.target2 = targ.target;
+               else if(targ.target2)
+                       self.target2 = targ.target2;
                else
                {
                        movelib_beak_simple(stopspeed);

diff --git a/qcsrc/server/mutators/gamemode_towerdefense.qc b/qcsrc/server/mutators/gamemode_towerdefense.qc
index d1872f9448bfcba2960dedc8e9b6f1fbf86d1041..5036e77d410089353a3d8c767cd0bac66ce7578e 100644 (file)
--- a/qcsrc/server/mutators/gamemode_towerdefense.qc
+++ b/qcsrc/server/mutators/gamemode_towerdefense.qc
@@ -763,22 +763,22 @@ MUTATOR_HOOKFUNCTION(td_MonsterCheckBossFlag)
 MUTATOR_HOOKFUNCTION(td_MonsterMove)
 {
        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((vlen(monster_target.origin - self.origin) <= 100 && monster_target.classname == "td_waypoint") || (vlen(monster_target.origin - self.origin) <= 200 && (self.flags & FL_FLY) && monster_target.classname == "td_waypoint"))
        {
-               if(self.goalentity.target2)
+               if(monster_target.target2)
                {
                        if(random() > 0.5)
-                               self.target2 = self.goalentity.target2;
+                               self.target2 = monster_target.target2;
                        else
-                               self.target2 = self.goalentity.target;
+                               self.target2 = monster_target.target;
                }
                else
-                       self.target2 = self.goalentity.target;
+                       self.target2 = monster_target.target;
                                
-               self.goalentity = find(world, targetname, self.target2);
+               monster_target = find(world, targetname, self.target2);
                
-               if(self.goalentity == world)
-                       self.goalentity = PickGenerator();
+               if(monster_target == world)
+                       monster_target = PickGenerator();
        }
        
        monster_speed_run = (m_speed_run + random() * 4) * monster_skill;