From: Lyberta <lyberta@lyberta.net>
Date: Wed, 12 Apr 2017 05:37:32 +0000 (+0300)
Subject: Survival: Proper health and armor giving.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=08891ac9b02531f634742f1d346e87e79f59f66d;p=xonotic%2Fxonotic-data.pk3dir.git

Survival: Proper health and armor giving.
---

diff --git a/qcsrc/server/mutators/mutator/gamemode_survival.qc b/qcsrc/server/mutators/mutator/gamemode_survival.qc
index 78bd29402..f48164a49 100644
--- a/qcsrc/server/mutators/mutator/gamemode_survival.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_survival.qc
@@ -1692,9 +1692,8 @@ MUTATOR_HOOKFUNCTION(surv, ItemTouch)
 				case "item_cells":
 				case "droppedweapon":
 				{
-					// FIXME: proper health pickup function.
-					player.health += g_pickup_healthmedium;
-					player.armorvalue += g_pickup_armormedium;
+					GivePlayerHealth(player, g_pickup_healthmedium);
+					GivePlayerArmor(player, g_pickup_armormedium);
 					return MUT_ITEMTOUCH_CONTINUE;
 				}
 			}