From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 21 Jan 2011 17:14:19 +0000 (+0200)
Subject: Add a check that was still necessary
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~153
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=54bf9ccade013c7dc4eb9014b55238078e6e6c5d;p=xonotic%2Fxonotic-data.pk3dir.git

Add a check that was still necessary
---

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index c0e57b8c0..f28bc03f8 100644
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -225,7 +225,10 @@ float w_shotgun(float req)
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
-		return self.ammo_shells >= autocvar_g_balance_shotgun_primary_ammo;
+		if(autocvar_g_balance_shotgun_reload_ammo)
+			return self.shotgun_load >= autocvar_g_balance_shotgun_primary_ammo;
+		else
+			return self.ammo_shells >= autocvar_g_balance_shotgun_primary_ammo;
 	}
 	else if (req == WR_CHECKAMMO2)
 	{
diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc
index 23a0609a7..5c6b49c0b 100644
--- a/qcsrc/server/w_sniperrifle.qc
+++ b/qcsrc/server/w_sniperrifle.qc
@@ -256,11 +256,17 @@ float w_sniperrifle(float req)
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
-		return self.ammo_nails >= autocvar_g_balance_sniperrifle_primary_ammo;
+		if(autocvar_g_balance_sniperrifle_reload_ammo)
+			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)
 	{
-		return self.ammo_nails >= autocvar_g_balance_sniperrifle_secondary_ammo;
+		if(autocvar_g_balance_sniperrifle_reload_ammo)
+			return self.sniperrifle_load >= autocvar_g_balance_sniperrifle_primary_ammo;
+		else
+			return self.ammo_nails >= autocvar_g_balance_sniperrifle_secondary_ammo;
 	}
 	else if (req == WR_RELOAD)
 	{