From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 25 Jan 2011 16:07:31 +0000 (+0200)
Subject: Fix electro beam ammo check. Not fully ready
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~80
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=af3f4509724015a6e5de7f32b5c4e9f2c592e7c9;p=xonotic%2Fxonotic-data.pk3dir.git

Fix electro beam ammo check. Not fully ready
---

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 295239150..61115b3a9 100644
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -554,16 +554,18 @@ float w_electro(float req)
 	else if (req == WR_CHECKAMMO1)
 	{
 		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.electro_load > 0;
+		}
 		else
-			ammo_amount = self.ammo_cells >= autocvar_g_balance_electro_primary_ammo;
-		if(autocvar_g_balance_electro_reload_ammo)
 		{
+			ammo_amount = self.ammo_cells >= autocvar_g_balance_electro_primary_ammo;
 			if(autocvar_g_balance_electro_lightning)
-				ammo_amount += !autocvar_g_balance_electro_primary_ammo || (self.electro_load > 0);
-			else
 				ammo_amount += self.electro_load >= autocvar_g_balance_electro_primary_ammo;
 		}
+
 		return ammo_amount;
 	}
 	else if (req == WR_CHECKAMMO2)