From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 8 Sep 2010 15:29:22 +0000 (+0300)
Subject: Use normal weapons in Clan Arena
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ddaf6ba92d6541ab9210533a0d2c66cdcdec8e3c;p=voretournament%2Fvoretournament.git

Use normal weapons in Clan Arena
---

diff --git a/data/qcsrc/server/cl_weapons.qc b/data/qcsrc/server/cl_weapons.qc
index 3bd7846b..0cd918ca 100644
--- a/data/qcsrc/server/cl_weapons.qc
+++ b/data/qcsrc/server/cl_weapons.qc
@@ -262,8 +262,6 @@ void W_ThrowWeapon(vector velo, vector delta, float doreduce)
 		return;
 	if (!cvar("g_pickup_items"))
 		return;
-	if (g_ca)
-		return;
 	if(!cvar("g_weapon_throwable"))
 		return;
 	if(cvar("g_weapon_stay") == 1)
diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 357e93ce..766b57c6 100644
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -874,7 +874,7 @@ void readplayerstartcvars()
 	start_health = cvar("g_balance_health_start");
 	start_armorvalue = cvar("g_balance_armor_start");
 
-	if (g_lms || g_ca)
+	if (g_lms)
 	{
 		start_ammo_fuel = cvar("g_lms_start_ammo_fuel");
 		start_health = cvar("g_lms_start_health");
@@ -907,23 +907,20 @@ void readplayerstartcvars()
 		warmup_start_armorvalue = start_armorvalue;
 		warmup_start_weapons = start_weapons;
 
-		if (!g_ca)
+		if (cvar("g_use_ammunition"))
 		{
-			if (cvar("g_use_ammunition"))
-			{
-				warmup_start_ammo_fuel = cvar("g_warmup_start_ammo_fuel");
-			}
-			warmup_start_health = cvar("g_warmup_start_health");
-			warmup_start_armorvalue = cvar("g_warmup_start_armor");
-			warmup_start_weapons = 0;
-			for (i = WEP_FIRST; i <= WEP_LAST; ++i)
+			warmup_start_ammo_fuel = cvar("g_warmup_start_ammo_fuel");
+		}
+		warmup_start_health = cvar("g_warmup_start_health");
+		warmup_start_armorvalue = cvar("g_warmup_start_armor");
+		warmup_start_weapons = 0;
+		for (i = WEP_FIRST; i <= WEP_LAST; ++i)
+		{
+			e = get_weaponinfo(i);
+			if(want_weapon("g_start_weapon_", e, cvar("g_warmup_allguns")))
 			{
-				e = get_weaponinfo(i);
-				if(want_weapon("g_start_weapon_", e, cvar("g_warmup_allguns")))
-				{
-					warmup_start_weapons |= e.weapons;
-					weapon_action(e.weapon, WR_PRECACHE);
-				}
+				warmup_start_weapons |= e.weapons;
+				weapon_action(e.weapon, WR_PRECACHE);
 			}
 		}
 	}
diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index 918347f5..37995acb 100644
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -625,7 +625,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 
 		weaponsInMap |= weaponid;
 
-		if(g_lms || g_ca)
+		if(g_lms)
 		{
 			startitem_failed = TRUE;
 			remove(self);