From c6943878191865a60de5079bff5ce303414c8aa0 Mon Sep 17 00:00:00 2001 From: cypress Date: Thu, 7 Dec 2023 13:07:59 -0500 Subject: [PATCH] SERVER: Fix cooling flamethrower weapons when not in active slot --- source/server/player.qc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/server/player.qc b/source/server/player.qc index 4acef27..533854a 100644 --- a/source/server/player.qc +++ b/source/server/player.qc @@ -444,7 +444,7 @@ void() PlayerPreThink = // FIXME: Weapon hardcode definition. float weapon_slot = Weapon_PlayerHasWeapon(self, W_M2, true); - if (!weapon_slot) + if (weapon_slot == 0) return; weapon_slot--; @@ -455,7 +455,7 @@ void() PlayerPreThink = if (self.cooldown && self.weapons[weapon_slot].weapon_magazine > 20) self.cooldown = false; - if (self.weapons[weapon_slot].weapon_magazine < getWeaponMag(self.weapon)) { + if (self.weapons[weapon_slot].weapon_magazine < getWeaponMag(self.weapons[weapon_slot].weapon_id)) { self.weapons[weapon_slot].weapon_magazine += 1; }