From: Lyberta <lyberta@lyberta.net>
Date: Sat, 26 Aug 2017 15:53:45 +0000 (+0300)
Subject: Use g_balance_health/armor_limit in GivePlayerStuff.
X-Git-Tag: xonotic-v0.8.5~2499^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7966b5374692b0b91a767caec0d4c2d34adcd6c4;p=xonotic%2Fxonotic-data.pk3dir.git

Use g_balance_health/armor_limit in GivePlayerStuff.
---

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index 61bc7dc57..81f45d6c2 100644
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -655,7 +655,7 @@ void GivePlayerHealth(entity player, float amount)
 		return;
 	}
 	player.health = bound(player.health, player.health + amount,
-		 g_pickup_healthmega_max);
+		 autocvar_g_balance_health_limit);
 	player.pauserothealth_finished = max(player.pauserothealth_finished, time +
 		autocvar_g_balance_pause_health_rot);
 }
@@ -667,7 +667,7 @@ void GivePlayerArmor(entity player, float amount)
 		return;
 	}
 	player.armorvalue = bound(player.armorvalue, player.armorvalue + amount,
-		 g_pickup_armormega_max);
+		 autocvar_g_balance_armor_limit);
 	player.pauserotarmor_finished = max(player.pauserotarmor_finished, time +
 		autocvar_g_balance_pause_armor_rot);
 }