From 82ac7d407d3094e4754838dddfedeef953675382 Mon Sep 17 00:00:00 2001 From: div0 Date: Mon, 30 Mar 2009 11:47:13 +0000 Subject: [PATCH] add a fuel icon to the sbar git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6372 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/gfx/sb_fuel.tga | Bin 0 -> 9376 bytes data/qcsrc/client/sbar.qc | 2 +- data/qcsrc/server/t_items.qc | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 data/gfx/sb_fuel.tga diff --git a/data/gfx/sb_fuel.tga b/data/gfx/sb_fuel.tga new file mode 100644 index 0000000000000000000000000000000000000000..76afb1b36f9741c08fc7036b94c15289a4fa6e29 GIT binary patch literal 9376 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 literal 0 HcmV?d00001 diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc index 4f15c5724..884c86e6c 100644 --- a/data/qcsrc/client/sbar.qc +++ b/data/qcsrc/client/sbar.qc @@ -1754,7 +1754,7 @@ string GetAmmoPicture(float i) { case 0: return "gfx/sb_shells"; case 1: return "gfx/sb_bullets"; - case 2: return "gfx/sb_rockets"; + case 2: return "gfx/sb_rocket"; case 3: return "gfx/sb_cells"; case 4: return "gfx/sb_fuel"; default: return ""; diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc index 31da9e067..2b97a35d3 100644 --- a/data/qcsrc/server/t_items.qc +++ b/data/qcsrc/server/t_items.qc @@ -180,7 +180,7 @@ float Item_GiveTo(entity item, entity player) } } - if((it = (item.items - (item.items & player.items) & IT_PICKUPMASK))) + if((it = (item.items - (item.items & player.items)) & IT_PICKUPMASK)) { pickedup = TRUE; player.items |= it; -- 2.39.2