From: Mario <mario.mario@y7mail.com>
Date: Thu, 7 Feb 2013 05:17:13 +0000 (+1100)
Subject: Fix monsters not attacking target entities
X-Git-Tag: xonotic-v0.8.0~241^2^2~539
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b41f8d337c7b9d2863bf45f03f5919b6a522d669;p=xonotic%2Fxonotic-data.pk3dir.git

Fix monsters not attacking target entities
---

diff --git a/qcsrc/server/mutators/gamemode_rts.qc b/qcsrc/server/mutators/gamemode_rts.qc
index 1774bba92..003534f8e 100644
--- a/qcsrc/server/mutators/gamemode_rts.qc
+++ b/qcsrc/server/mutators/gamemode_rts.qc
@@ -101,12 +101,15 @@ MUTATOR_HOOKFUNCTION(rts_PlayerThink)
 	}
 	if(self.BUTTON_ATCK2)
 	{
-		entity e;
+		entity e = world;
 		if(self.cursor_trace_ent) e = self.cursor_trace_ent;
 		else e = findradius(self.cursor_trace_endpos, 50);
 		
-		if(!IsDifferentTeam(e, self) || !e.takedamage)
-			e = world;
+		if not(IsDifferentTeam(e, self))
+			e = world; // same team
+		
+		if not(e.takedamage)
+			e = world; // can't hurt this enemy
 		
 		if(e == world)
 		{
@@ -121,7 +124,11 @@ MUTATOR_HOOKFUNCTION(rts_PlayerThink)
 			if not(head.selected) continue;
 			
 			if(e)
+			{
+				remove(head.goalentity);
+				head.goalentity = world;
 				head.enemy = e;
+			}
 			else if(wp)
 			{
 				head.goalentity = wp;