From: Mario <mario.mario@y7mail.com>
Date: Tue, 23 Apr 2013 11:11:33 +0000 (+1000)
Subject: Use start_health for mage player health checks
X-Git-Tag: xonotic-v0.8.0~241^2^2~293
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=522df11c01fb1420948a71a0598a6b5641fe6907;p=xonotic%2Fxonotic-data.pk3dir.git

Use start_health for mage player health checks
---

diff --git a/qcsrc/server/monsters/monster/shalrath.qc b/qcsrc/server/monsters/monster/shalrath.qc
index 4806da595..1ba434a35 100644
--- a/qcsrc/server/monsters/monster/shalrath.qc
+++ b/qcsrc/server/monsters/monster/shalrath.qc
@@ -54,7 +54,7 @@ void shalrath_think ()
 		if not(IsDifferentTeam(head, self))
 		if(head.health > 0)
 		if(vlen(head.origin - self.origin) < autocvar_g_monster_shalrath_heal_range)
-		if((!g_minstagib && head.health < autocvar_g_balance_health_regenstable) || (g_minstagib && head.ammo_cells < start_ammo_cells))
+		if((!g_minstagib && head.health < start_health) || (g_minstagib && head.ammo_cells < start_ammo_cells))
 		{
 			friend_needshelp = TRUE;
 			break; // found 1 player near us who is low on health
@@ -321,7 +321,7 @@ void shalrath_heal()
 		{
 			if(IS_PLAYER(head))
 			{
-				if((g_minstagib && head.ammo_cells < start_ammo_cells) || head.health < g_pickup_healthmedium_max)
+				if((g_minstagib && head.ammo_cells < start_ammo_cells) || head.health < start_health)
 					pointparticles(particleeffectnum(((g_minstagib) ? "ammoregen_fx" : "healing_fx")), head.origin, '0 0 0', 1);
 				if(g_minstagib)
 					head.ammo_cells = bound(0, head.ammo_cells + 1, start_ammo_cells);