From: Mircea Kitsune Date: Fri, 11 Feb 2011 17:23:35 +0000 (+0200) Subject: A small change X-Git-Tag: xonotic-v0.5.0~309^2~7^2~47 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=deae2e555af4ff67bb33620775717ae1eedf8e70;p=xonotic%2Fxonotic-data.pk3dir.git A small change --- diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc index c04bbd257..e55b3a4ff 100644 --- a/qcsrc/server/cl_weaponsystem.qc +++ b/qcsrc/server/cl_weaponsystem.qc @@ -1614,17 +1614,17 @@ void W_SetupProjectileVelocity(entity missile, float pSpeed, float spread) void W_DecreaseAmmo(.float ammo_type, float ammo_use, float ammo_reload) { - // if this weapon is reloadable, decrease its load. Else decrease the player's ammo if not(self.items & IT_UNLIMITED_WEAPON_AMMO) + return; + + // if this weapon is reloadable, decrease its load. Else decrease the player's ammo + if(ammo_reload) { - if(ammo_reload) - { - self.clip_load -= ammo_use; - self.weapon_load[self.weapon] = self.clip_load; - } - else - self.(self.current_ammo) -= ammo_use; + self.clip_load -= ammo_use; + self.weapon_load[self.weapon] = self.clip_load; } + else + self.(self.current_ammo) -= ammo_use; } // weapon reloading code