From 01163648038bb7a2ceea0d1f13946be7c6a3f969 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Sat, 22 May 2021 16:40:07 +0200 Subject: [PATCH] item_weaponbox: Don't include ITEM_SATCHEL if ammo_satchels is 0, same for other throw and placement weapons. --- src/server/item_weaponbox.qc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/server/item_weaponbox.qc b/src/server/item_weaponbox.qc index 60bec04..7d08e72 100644 --- a/src/server/item_weaponbox.qc +++ b/src/server/item_weaponbox.qc @@ -94,6 +94,16 @@ void item_weaponbox::setup(player pl) ammo_snark = pl.ammo_snark; ammo_hornet = pl.ammo_hornet; weapon_items = pl.g_items; + + /* none of this! */ + if (ammo_satchel == 0 && pl.g_items & ITEM_SATCHEL) + weapon_items &= ~ITEM_SATCHEL; + if (ammo_handgrenade == 0 && pl.g_items & ITEM_HANDGRENADE) + weapon_items &= ~ITEM_HANDGRENADE; + if (ammo_snark == 0 && pl.g_items & ITEM_SNARK) + weapon_items &= ~ITEM_SNARK; + if (ammo_tripmine == 0 && pl.g_items & ITEM_TRIPMINE) + weapon_items &= ~ITEM_TRIPMINE; } void item_weaponbox::item_weaponbox(void)