From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 16 Jul 2011 11:50:05 +0000 (+0300)
Subject: Properly check if we have enough ammo for an attack
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=96a757ee35cdde9ef44b9af1d15aa957e2d56925;p=voretournament%2Fvoretournament.git

Properly check if we have enough ammo for an attack
---

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 52598904..a41c01fd 100644
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -213,20 +213,26 @@ float w_grabber(float req)
 	{
 		if(self.grabber)
 		{
-			ammo_amount = self.ammo_fuel > 0;
-			ammo_amount += self.weapon_load[WEP_GRABBER] > 0;
+			if(cvar("g_balance_grabber_reload_ammo"))
+				ammo_amount = self.weapon_load[WEP_GRABBER] > 0;
+			else
+				ammo_amount = self.ammo_fuel > 0;
 		}
 		else
 		{
-			ammo_amount = self.ammo_fuel >= cvar("g_balance_grabber_primary_ammo");
-			ammo_amount += self.weapon_load[WEP_GRABBER] >= cvar("g_balance_grabber_primary_ammo");
+			if(cvar("g_balance_grabber_reload_ammo"))
+				ammo_amount = self.weapon_load[WEP_GRABBER] >= cvar("g_balance_grabber_primary_ammo");
+			else
+				ammo_amount = self.ammo_fuel >= cvar("g_balance_grabber_primary_ammo");
 		}
 		return ammo_amount;
 	}
 	else if (req == WR_CHECKAMMO2)
 	{
-		ammo_amount = self.ammo_fuel >= cvar("g_balance_grabber_secondary_ammo");
-		ammo_amount += self.weapon_load[WEP_GRABBER] >= cvar("g_balance_grabber_secondary_ammo");
+		if(cvar("g_balance_grabber_reload_ammo"))
+			ammo_amount = self.weapon_load[WEP_GRABBER] >= cvar("g_balance_grabber_secondary_ammo");
+		else
+			ammo_amount = self.ammo_fuel >= cvar("g_balance_grabber_secondary_ammo");
 		return ammo_amount;
 	}
 	else if (req == WR_RELOAD)