From: Lyberta <lyberta@lyberta.net>
Date: Mon, 28 Aug 2017 06:45:14 +0000 (+0300)
Subject: Survival: Updated to URS2.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d157a3945a057f328b7e76bd09ef0481ad411de6;p=xonotic%2Fxonotic-data.pk3dir.git

Survival: Updated to URS2.
---

diff --git a/qcsrc/server/mutators/mutator/gamemode_survival.qc b/qcsrc/server/mutators/mutator/gamemode_survival.qc
index 7e09d61bce..c206dafa3b 100644
--- a/qcsrc/server/mutators/mutator/gamemode_survival.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_survival.qc
@@ -2051,33 +2051,33 @@ MUTATOR_HOOKFUNCTION(surv, PlayerDies, CBC_ORDER_FIRST)
 		{
 			case SURVIVAL_ROLE_PLAYER:
 			{
-				GivePlayerHealth(attacker,
+				GiveResource(attacker, RESOURCE_HEALTH,
 					autocvar_g_surv_defender_attacker_frag_health);
-				GivePlayerArmor(attacker,
+				GiveResource(attacker, RESOURCE_ARMOR,
 					autocvar_g_surv_defender_attacker_frag_armor);
-				GivePlayerResource(attacker, RESOURCE_SHELLS,
+				GiveResource(attacker, RESOURCE_SHELLS,
 					autocvar_g_surv_defender_attacker_frag_shells);
-				GivePlayerResource(attacker, RESOURCE_BULLETS,
+				GiveResource(attacker, RESOURCE_BULLETS,
 					autocvar_g_surv_defender_attacker_frag_bullets);
-				GivePlayerResource(attacker, RESOURCE_ROCKETS,
+				GiveResource(attacker, RESOURCE_ROCKETS,
 					autocvar_g_surv_defender_attacker_frag_rockets);
-				GivePlayerResource(attacker, RESOURCE_CELLS,
+				GiveResource(attacker, RESOURCE_CELLS,
 					autocvar_g_surv_defender_attacker_frag_cells);
 				break;
 			}
 			case SURVIVAL_ROLE_CANNON_FODDER:
 			{
-				GivePlayerHealth(attacker,
+				GiveResource(attacker, RESOURCE_HEALTH,
 					autocvar_g_surv_defender_cannon_fodder_frag_health);
-				GivePlayerArmor(attacker,
+				GiveResource(attacker, RESOURCE_ARMOR,
 					autocvar_g_surv_defender_cannon_fodder_frag_armor);
-				GivePlayerResource(attacker, RESOURCE_SHELLS,
+				GiveResource(attacker, RESOURCE_SHELLS,
 					autocvar_g_surv_defender_cannon_fodder_frag_shells);
-				GivePlayerResource(attacker, RESOURCE_BULLETS,
+				GiveResource(attacker, RESOURCE_BULLETS,
 					autocvar_g_surv_defender_cannon_fodder_frag_bullets);
-				GivePlayerResource(attacker, RESOURCE_ROCKETS,
+				GiveResource(attacker, RESOURCE_ROCKETS,
 					autocvar_g_surv_defender_cannon_fodder_frag_rockets);
-				GivePlayerResource(attacker, RESOURCE_CELLS,
+				GiveResource(attacker, RESOURCE_CELLS,
 					autocvar_g_surv_defender_cannon_fodder_frag_cells);
 				break;
 			}