From 8864567ea710555af39cac30456582afcc7ab4af Mon Sep 17 00:00:00 2001 From: terencehill Date: Wed, 28 Dec 2016 19:39:29 +0100 Subject: [PATCH] Fix ammo rating, it was always rated 0 --- qcsrc/common/t_items.qc | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc index ebab941c02..b506141e8c 100644 --- a/qcsrc/common/t_items.qc +++ b/qcsrc/common/t_items.qc @@ -1001,18 +1001,15 @@ float commodity_pickupevalfunc(entity player, entity item) if(!(player.weapons & (it.m_wepset))) continue; - if(it.items & ITEM_Shells.m_itemid) - need_shells = true; - else if(it.items & ITEM_Bullets.m_itemid) - need_nails = true; - else if(it.items & ITEM_Rockets.m_itemid) - need_rockets = true; - else if(it.items & ITEM_Cells.m_itemid) - need_cells = true; - else if(it.items & ITEM_Plasma.m_itemid) - need_plasma = true; - else if(it.items & ITEM_JetpackFuel.m_itemid) - need_fuel = true; + switch(it.ammo_field) + { + case ammo_shells: need_shells = true; break; + case ammo_nails: need_nails = true; break; + case ammo_rockets: need_rockets = true; break; + case ammo_cells: need_cells = true; break; + case ammo_plasma: need_plasma = true; break; + case ammo_fuel: need_fuel = true; break; + } }); // TODO: figure out if the player even has the weapon this ammo is for? -- 2.39.2