From: Mircea Kitsune Date: Fri, 21 Jan 2011 14:45:13 +0000 (+0200) Subject: Check the weapon load, not player ammo X-Git-Tag: xonotic-v0.5.0~309^2~7^2~162 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=63d599c0e8a641660569aee5b1e6e5e2f434607b;p=xonotic%2Fxonotic-data.pk3dir.git Check the weapon load, not player ammo --- diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc index a44c5bada..83087c323 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, autocvar_g_balance_shotgun_primary_ammo, 0)) + if(!W_ReloadCheck(self.shotgun_load, 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 f62aeabf6..56018ac2a 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, autocvar_g_balance_sniperrifle_primary_ammo, autocvar_g_balance_sniperrifle_secondary_ammo)) + if(!W_ReloadCheck(self.sniperrifle_load, 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);