From: Lyberta <lyberta@lyberta.net>
Date: Tue, 22 Aug 2017 22:21:12 +0000 (+0300)
Subject: Survival: Updated to new player template function names.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7b6be8a8fa8843ad236bd057ef28f7efab2d610a;p=xonotic%2Fxonotic-data.pk3dir.git

Survival: Updated to new player template function names.
---

diff --git a/qcsrc/server/mutators/mutator/gamemode_survival.qc b/qcsrc/server/mutators/mutator/gamemode_survival.qc
index 09c0ba8527..b47660c62a 100644
--- a/qcsrc/server/mutators/mutator/gamemode_survival.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_survival.qc
@@ -1876,7 +1876,7 @@ MUTATOR_HOOKFUNCTION(surv, PlayerSpawn)
 	}
 	else
 	{
-		PlayerTemplate_PlayerSpawn(player, Surv_GetPlayerTemplate(player));
+		PlayerTemplateHook_PlayerSpawn(player, Surv_GetPlayerTemplate(player));
 	}
 	switch (player.team)
 	{
@@ -1911,7 +1911,7 @@ MUTATOR_HOOKFUNCTION(surv, FixPlayermodel)
 MUTATOR_HOOKFUNCTION(surv, ForbidThrowCurrentWeapon)
 {
 	entity player = M_ARGV(0, entity);
-	return PlayerTemplate_ForbidThrowCurrentWeapon(player,
+	return PlayerTemplateHook_ForbidThrowCurrentWeapon(
 		Surv_GetPlayerTemplate(player));
 }
 
@@ -1924,7 +1924,8 @@ MUTATOR_HOOKFUNCTION(surv, PlayerRegen)
 	{
 		return true;
 	}
-	return PlayerTemplate_PlayerRegen(player, Surv_GetPlayerTemplate(player));
+	return PlayerTemplateHook_PlayerRegen(player,
+		Surv_GetPlayerTemplate(player));
 }
 
 /// \brief Hook that is called to determine if balance messages will appear.
@@ -1942,7 +1943,7 @@ MUTATOR_HOOKFUNCTION(surv, ItemTouch)
 	{
 		case surv_attackerteam:
 		{
-			return PlayerTemplate_ItemTouch(player, item,
+			return PlayerTemplateHook_ItemTouch(player, item,
 				Surv_GetPlayerTemplate(player));
 		}
 		case surv_defenderteam:
@@ -1972,7 +1973,7 @@ MUTATOR_HOOKFUNCTION(surv, ItemTouch)
 				}
 				default:
 				{
-					return PlayerTemplate_ItemTouch(player, item,
+					return PlayerTemplateHook_ItemTouch(player, item,
 						Surv_GetPlayerTemplate(player));
 				}
 			}
@@ -1990,7 +1991,7 @@ MUTATOR_HOOKFUNCTION(surv, Damage_Calculate)
 	entity frag_target = M_ARGV(2, entity);
 	float deathtype = M_ARGV(3, float);
 	float damage = M_ARGV(4, float);
-	M_ARGV(4, float) = PlayerTemplate_Damage_Calculate(frag_attacker,
+	M_ARGV(4, float) = PlayerTemplateHook_Damage_Calculate(frag_attacker,
 		Surv_GetPlayerTemplate(frag_attacker), frag_target,
 		Surv_GetPlayerTemplate(frag_target), deathtype, damage);
 }
@@ -2042,7 +2043,7 @@ MUTATOR_HOOKFUNCTION(surv, PlayerDies, CBC_ORDER_FIRST)
 	//DebugPrintToChatAll("PlayerDies");
 	entity attacker = M_ARGV(1, entity);
 	entity victim = M_ARGV(2, entity);
-	PlayerTemplate_PlayerDies(victim, Surv_GetPlayerTemplate(victim));
+	PlayerTemplateHook_PlayerDies(victim, Surv_GetPlayerTemplate(victim));
 	if ((attacker.team == surv_defenderteam) &&
 		(victim.team == surv_attackerteam))
 	{