From 54bf9ccade013c7dc4eb9014b55238078e6e6c5d Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Fri, 21 Jan 2011 19:14:19 +0200 Subject: [PATCH] Add a check that was still necessary --- qcsrc/server/w_shotgun.qc | 5 ++++- qcsrc/server/w_sniperrifle.qc | 10 ++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) 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) { -- 2.39.2