From 1d3cd6d0346ea21bdbae7806d5ad2f1c8575a8f0 Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Fri, 21 Jan 2011 16:20:14 +0200 Subject: [PATCH] Properly check the necessary amount of ammo for reloading --- qcsrc/server/cl_weaponsystem.qc | 4 ++-- qcsrc/server/w_shotgun.qc | 2 +- qcsrc/server/w_sniperrifle.qc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc index 914abef35..0e0335b9f 100644 --- a/qcsrc/server/cl_weaponsystem.qc +++ b/qcsrc/server/cl_weaponsystem.qc @@ -1616,9 +1616,9 @@ void W_SetupProjectileVelocity(entity missile, float pSpeed, float spread) // weapon reload code // ---------------------------------------------------------------- -float W_ReloadCheck(float ammo_amount) +float W_ReloadCheck(float ammo_amount, float ammo_use_primary, float ammo_use_secondary) { - if(ammo_amount < min(autocvar_g_balance_sniperrifle_primary_ammo, autocvar_g_balance_sniperrifle_secondary_ammo)) // when we get here, ammo_counter must be 0 or -1 + if(ammo_amount < min(ammo_use_primary, ammo_use_secondary)) // when we get here, ammo_counter must be 0 or -1 { print("cannot reload... not enough ammo\n"); self.ammo_counter = -1; // reload later diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc index 2e8615997..118fbf088 100644 --- a/qcsrc/server/w_shotgun.qc +++ b/qcsrc/server/w_shotgun.qc @@ -40,7 +40,7 @@ void W_Shotgun_Reload() float t; - if(!W_ReloadCheck(self.ammo_shells)) + if(!W_ReloadCheck(self.ammo_shells, autocvar_g_balance_shotgun_primary_ammo, 0)) return; sound (self, CHAN_WEAPON2, "weapons/campingrifle_reload.wav", VOL_BASE, ATTN_NORM); diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc index 8a3f5a5de..d31796d90 100644 --- a/qcsrc/server/w_sniperrifle.qc +++ b/qcsrc/server/w_sniperrifle.qc @@ -44,7 +44,7 @@ void W_SniperRifle_Reload() float t; - if(!W_ReloadCheck(self.ammo_nails)) + if(!W_ReloadCheck(self.ammo_nails, autocvar_g_balance_sniperrifle_primary_ammo, autocvar_g_balance_sniperrifle_secondary_ammo)) return; sound (self, CHAN_WEAPON2, "weapons/campingrifle_reload.wav", VOL_BASE, ATTN_NORM); -- 2.39.2