From: Mario <mario.mario@y7mail.com>
Date: Thu, 18 Apr 2013 06:50:20 +0000 (+1000)
Subject: Also check if monster teammates need help
X-Git-Tag: xonotic-v0.8.0~241^2^2~357
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=73c75e0d698a476cfe4848d206966b4f2b19c303;p=xonotic%2Fxonotic-data.pk3dir.git

Also check if monster teammates need help
---

diff --git a/qcsrc/server/monsters/monster/shalrath.qc b/qcsrc/server/monsters/monster/shalrath.qc
index f06900257..4914a4bff 100644
--- a/qcsrc/server/monsters/monster/shalrath.qc
+++ b/qcsrc/server/monsters/monster/shalrath.qc
@@ -45,6 +45,19 @@ void shalrath_think ()
 	
 	FOR_EACH_PLAYER(head)
 	{
+		if not(IsDifferentTeam(head, self))
+		if(head.health > 0)
+		if(vlen(head.origin - self.origin) < autocvar_g_monster_shalrath_heal_range * self.scale)
+		if((!g_minstagib && head.health < autocvar_g_balance_health_regenstable) || (g_minstagib && head.ammo_cells < start_ammo_cells))
+		{
+			friend_needshelp = TRUE;
+			break; // found 1 player near us who is low on health
+		}
+	}
+	FOR_EACH_MONSTER(head)
+	{
+		if not(IsDifferentTeam(head, self))
+		if(head.health > 0)
 		if(vlen(head.origin - self.origin) < autocvar_g_monster_shalrath_heal_range * self.scale)
 		if((!g_minstagib && head.health < autocvar_g_balance_health_regenstable) || (g_minstagib && head.ammo_cells < start_ammo_cells))
 		{
@@ -59,9 +72,6 @@ void shalrath_think ()
 	if(self.weaponentity)
 	if(time >= self.weaponentity.ltime)
 		shalrath_shield_die();
-	
-	if(self.delay != -1)
-		self.nextthink = self.delay;
 		
 	if(self.health < autocvar_g_monster_shalrath_heal_minhealth || friend_needshelp)
 	if(time >= self.attack_finished_single)