From b5691a2832394213ee79e8fe413f9098e31dfd21 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Thu, 7 Jul 2011 16:28:39 +0300 Subject: [PATCH] Show a different fuel icon when owning the fuel_regen --- data/gfx/hud/sb_fuel_regen.tga | Bin 0 -> 14636 bytes data/qcsrc/client/View.qc | 2 +- data/qcsrc/client/sbar.qc | 9 +++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 data/gfx/hud/sb_fuel_regen.tga diff --git a/data/gfx/hud/sb_fuel_regen.tga b/data/gfx/hud/sb_fuel_regen.tga new file mode 100644 index 0000000000000000000000000000000000000000..c67c269888f50d2158a07d5d64d7778d5010c55a GIT binary patch literal 14636 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 literal 0 HcmV?d00001 diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index c957f0f3..3daed155 100644 --- a/data/qcsrc/client/View.qc +++ b/data/qcsrc/client/View.qc @@ -597,7 +597,7 @@ void CSQC_UpdateView(float w, float h) contentalpha_temp = bound(0, drawframetime / max(0.0001, contentfadetime), 1); contentavgalpha = contentavgalpha * (1 - contentalpha_temp) + incontent * contentalpha_temp; - + if(contentavgalpha) drawfill('0 0 0', '1 0 0' * vid_conwidth + '0 1 0' * vid_conheight, liquidcolor_prev, contentavgalpha * liquidalpha_prev, DRAWFLAG_NORMAL); diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc index d9f805cf..e797c188 100644 --- a/data/qcsrc/client/sbar.qc +++ b/data/qcsrc/client/sbar.qc @@ -2658,8 +2658,13 @@ string GetAmmoPicture(float i) { switch(i) { - case 0: return "gfx/hud/sb_fuel"; - default: return ""; + case 0: + if(getstati(STAT_ITEMS) & IT_FUEL_REGEN) + return "gfx/hud/sb_fuel_regen"; + else + return "gfx/hud/sb_fuel"; + default: + return ""; } } -- 2.39.2