From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 22 Jan 2011 15:18:04 +0000 (+0200)
Subject: Fix the ammo check for that last change
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~115
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0ed9b0b3e4882020328878ca963de631fe6c28cb;p=xonotic%2Fxonotic-data.pk3dir.git

Fix the ammo check for that last change
---

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index da25ad8ff..207d1d716 100644
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -334,10 +334,12 @@ float w_minstanex(float req)
 	}
 	else if (req == WR_CHECKAMMO2)
 	{
-		if(autocvar_g_balance_minstanex_laser_ammo)
-			return autocvar_g_balance_minstanex_laser_ammo;
-		else
+		if(!autocvar_g_balance_minstanex_laser_ammo)
 			return TRUE;
+		if(autocvar_g_balance_minstanex_reload_ammo)
+			return self.clip_load >= autocvar_g_balance_minstanex_laser_ammo;
+		else
+			return self.ammo_cells >= autocvar_g_balance_minstanex_laser_ammo;
 	}
 	else if (req == WR_RESETPLAYER)
 	{