From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 10 Feb 2011 17:48:18 +0000 (+0200)
Subject: Small fix for Electro ammo code
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~60
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6b61fc711053ba98b760b8ad1cb0fd97ba0f59a8;p=xonotic%2Fxonotic-data.pk3dir.git

Small fix for Electro ammo code
---

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 160d2df7f..92775d210 100644
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -530,15 +530,16 @@ float w_electro(float req)
 	{
 		if(autocvar_g_balance_electro_lightning)
 		{
-			ammo_amount = !autocvar_g_balance_electro_primary_ammo || (self.ammo_cells > 0);
-			if(autocvar_g_balance_electro_lightning)
-				ammo_amount += self.weapon_load[WEP_ELECTRO] > 0;
+			if(!autocvar_g_balance_electro_primary_ammo)
+				ammo_amount = 1;
+			else
+				ammo_amount = self.ammo_cells > 0;
+			ammo_amount += self.weapon_load[WEP_ELECTRO] > 0;
 		}
 		else
 		{
 			ammo_amount = self.ammo_cells >= autocvar_g_balance_electro_primary_ammo;
-			if(autocvar_g_balance_electro_lightning)
-				ammo_amount += self.weapon_load[WEP_ELECTRO] >= autocvar_g_balance_electro_primary_ammo;
+			ammo_amount += self.weapon_load[WEP_ELECTRO] >= autocvar_g_balance_electro_primary_ammo;
 		}
 		return ammo_amount;
 	}