From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 21 Jan 2011 14:39:16 +0000 (+0200)
Subject: Properly check the amount of ammo we'd be using too
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~163
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=5f7cad4b3dc7367beba577b396a4624b15512962

Properly check the amount of ammo we'd be using too
---

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index a2cf7bdac..a44c5bada 100644
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -223,7 +223,7 @@ float w_shotgun(float req)
 	else if (req == WR_CHECKAMMO1)
 	{
 		if(autocvar_g_balance_shotgun_reload_ammo)
-			return self.shotgun_load;
+			return self.shotgun_load >= autocvar_g_balance_shotgun_primary_ammo;
 		else
 			return self.ammo_shells >= autocvar_g_balance_shotgun_primary_ammo;
 	}
diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc
index c1b9386f4..f62aeabf6 100644
--- a/qcsrc/server/w_sniperrifle.qc
+++ b/qcsrc/server/w_sniperrifle.qc
@@ -275,14 +275,14 @@ float w_sniperrifle(float req)
 	else if (req == WR_CHECKAMMO1)
 	{
 		if(autocvar_g_balance_sniperrifle_reload_ammo)
-			return self.sniperrifle_load;
+			return self.sniperrifle_load >= autocvar_g_balance_sniperrifle_primary_ammo;
 		else
 			return self.ammo_nails >= autocvar_g_balance_sniperrifle_primary_ammo;
 	}
 	else if (req == WR_CHECKAMMO2)
 	{
 		if(autocvar_g_balance_sniperrifle_reload_ammo)
-			return self.sniperrifle_load;
+			return self.sniperrifle_load >= autocvar_g_balance_sniperrifle_secondary_ammo;
 		else
 			return self.ammo_nails >= autocvar_g_balance_sniperrifle_secondary_ammo;
 	}