From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 25 Jan 2011 16:51:47 +0000 (+0200)
Subject: Fully fix Electro ammo checks
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~78
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b6e9ede0a2a2200bcb42a1ddc9919ecfdd515d37;p=xonotic%2Fxonotic-data.pk3dir.git

Fully fix Electro ammo checks
---

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index f5291822b..e14064ef0 100644
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -473,9 +473,25 @@ float w_electro(float req)
 	}
 	else if (req == WR_THINK)
 	{
-		if(autocvar_g_balance_electro_reload_ammo && self.clip_load < min(autocvar_g_balance_electro_primary_ammo, autocvar_g_balance_electro_secondary_ammo)) // forced reload
-			W_Electro_Reload();
-		else if (self.BUTTON_ATCK)
+		if(autocvar_g_balance_electro_reload_ammo) // forced reload
+		{
+			if(autocvar_g_balance_electro_lightning)
+			{
+				if(self.clip_load > 0)
+					ammo_amount = 1;
+			}
+			else if(self.clip_load >= autocvar_g_balance_electro_primary_ammo)
+				ammo_amount = 1;
+			if(self.clip_load >= autocvar_g_balance_electro_secondary_ammo)
+				ammo_amount += 1;
+
+			if(!ammo_amount)
+			{
+				W_Electro_Reload();
+				return FALSE;
+			}
+		}
+		if (self.BUTTON_ATCK)
 		{
 			if(autocvar_g_balance_electro_lightning)
 				if(self.BUTTON_ATCK_prev)