From: terencehill <piuntn@gmail.com>
Date: Tue, 25 Dec 2012 15:08:41 +0000 (+0100)
Subject: Add ForbidThrowCurrentWeapon hook to CA and cleanup some checks
X-Git-Tag: xonotic-v0.7.0~61^2~74
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5935b37eb1d1e5b540995bd86aab9aeca3dd7b24;p=xonotic%2Fxonotic-data.pk3dir.git

Add ForbidThrowCurrentWeapon hook to CA and cleanup some checks
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index e4bd68521..306e40f86 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -293,7 +293,7 @@ entity SelectSpawnPoint (float anypoint)
 	else
 	{
 		float mindist;
-		if (arena_roundbased && !g_ca)
+		if (g_arena && arena_roundbased)
 			mindist = 800;
 		else
 			mindist = 100;
diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index 35b920309..81102d62d 100644
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -312,8 +312,6 @@ float W_IsWeaponThrowable(float w)
 		return 0;
 	if (g_lms)
 		return 0;
-	if (g_ca)
-		return 0;
 	if (g_cts)
 		return 0;
 	if (g_nexball && w == WEP_GRENADE_LAUNCHER)
diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 1e7d2815d..0528c7dbc 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -131,9 +131,8 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype)
 
 	PlayerScore_Add(targ, SP_DEATHS, 1);
 
-	if(g_arena || g_ca)
-		if(autocvar_g_arena_roundbased)
-			return;
+	if(g_arena && arena_roundbased)
+		return;
 
 	if(targ != attacker) // not for suicides
 	if(g_weaponarena_random)
diff --git a/qcsrc/server/mutators/gamemode_ca.qc b/qcsrc/server/mutators/gamemode_ca.qc
index 8f6d6923e..0db2c5beb 100644
--- a/qcsrc/server/mutators/gamemode_ca.qc
+++ b/qcsrc/server/mutators/gamemode_ca.qc
@@ -180,6 +180,10 @@ MUTATOR_HOOKFUNCTION(ca_ForbidPlayerScore_Clear)
 {
 	return 1;
 }
+MUTATOR_HOOKFUNCTION(ca_ForbidThrowCurrentWeapon)
+{
+	return 1;
+}
 
 void ca_Initialize()
 {
@@ -201,6 +205,7 @@ MUTATOR_DEFINITION(gamemode_ca)
 	MUTATOR_HOOK(GetTeamCount, ca_GetTeamCount, CBC_ORDER_EXCLUSIVE);
 	MUTATOR_HOOK(PlayerPreThink, ca_PlayerPreThink, CBC_ORDER_ANY);
 	MUTATOR_HOOK(ForbidPlayerScore_Clear, ca_ForbidPlayerScore_Clear, CBC_ORDER_ANY);
+	MUTATOR_HOOK(ForbidThrowCurrentWeapon, ca_ForbidThrowCurrentWeapon, CBC_ORDER_ANY);
 
 	MUTATOR_ONADD
 	{