From: terencehill <piuntn@gmail.com>
Date: Sun, 20 Mar 2011 22:36:09 +0000 (+0100)
Subject: Remove wrong unlimited ammo check in Hook attack code, it should be checked in W_Decr... 
X-Git-Tag: xonotic-v0.5.0~305^2~28^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a312dcbb239fa30b63550a4fd294c494223a2d42;p=xonotic%2Fxonotic-data.pk3dir.git

Remove wrong unlimited ammo check in Hook attack code, it should be checked in W_DecreaseAmmo
---

diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc
index c3a1768be..80c40b10f 100644
--- a/qcsrc/server/w_hook.qc
+++ b/qcsrc/server/w_hook.qc
@@ -62,8 +62,7 @@ void W_Hook_Attack2()
 {
 	local entity gren;
 
-	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-		W_DecreaseAmmo(ammo_cells, autocvar_g_balance_hook_secondary_ammo, FALSE);
+	W_DecreaseAmmo(ammo_cells, autocvar_g_balance_hook_secondary_ammo, FALSE);
 	W_SetupShot (self, FALSE, 4, "weapons/hookbomb_fire.wav", CHAN_WEAPON, autocvar_g_balance_hook_secondary_damage);
 
 	gren = spawn ();
@@ -126,8 +125,7 @@ float w_hook(float req)
 			if (time > self.hook_refire)
 			if (weapon_prepareattack(0, -1))
 			{
-				if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-					W_DecreaseAmmo(ammo_fuel, autocvar_g_balance_hook_primary_fuel, FALSE);
+				W_DecreaseAmmo(ammo_fuel, autocvar_g_balance_hook_primary_fuel, FALSE);
 				self.hook_state |= HOOK_FIRING;
 				weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_hook_primary_animtime, w_ready);				
 			}