From: Mario <mario.mario@y7mail.com>
Date: Mon, 22 Apr 2013 09:58:05 +0000 (+1000)
Subject: Use targ/monster_target instead of goalentity
X-Git-Tag: xonotic-v0.8.0~241^2^2~320
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2e4e64d13e72467aa9d9ba50caadeec6dc6b1da7;p=xonotic%2Fxonotic-data.pk3dir.git

Use targ/monster_target instead of goalentity
---

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index fcfb2e7a7..7da1256bb 100644
--- 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 d1872f944..5036e77d4 100644
--- 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;