From 25f8c8c97e289fcf5eab07c809cf24f2c0c8f66b Mon Sep 17 00:00:00 2001 From: FruitieX Date: Sun, 2 May 2010 01:11:44 +0300 Subject: [PATCH] improvements to the health/armor panel, still one mode WIP --- gfx/hud/sb_health.tga | Bin 20271 -> 20271 bytes qcsrc/client/hud.qc | 72 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 58 insertions(+), 14 deletions(-) diff --git a/gfx/hud/sb_health.tga b/gfx/hud/sb_health.tga index 1a950cd3cd99ce15e59f6e49767b370006862af3..77286922495e3aa052417e31bbc0edb0c2f5dfad 100644 GIT binary patch literal 20271 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 b9{#O=qIuzlrR$ciUNvFUqNOVqPE7n4M~mny literal 20271 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 200) { @@ -238,7 +238,7 @@ void HUD_DrawXNum_Colored (vector pos, float x, float lettersize, float alpha) color_y = 0; color_z = 0; } - HUD_DrawXNum(pos, x, 3, 0, lettersize, color, 0, 0, alpha, DRAWFLAG_NORMAL); + HUD_DrawXNum(pos, x, digits, 0, lettersize, color, 0, 0, alpha, DRAWFLAG_NORMAL); } float stringwidth_colors(string s, vector theSize) @@ -1327,6 +1327,7 @@ void HUD_HealthArmor(void) float armor, health, x; armor = getstati(STAT_ARMOR); health = getstati(STAT_HEALTH); + float numbers; if(hud_hudselector == 2) // combined health and armor display { @@ -1349,7 +1350,7 @@ void HUD_HealthArmor(void) drawpic(num_pos + '108 -4.5 0', "gfx/hud/sb_health", '20 20 0', '1 1 1', hud_alpha_fg * v_y / armor, DRAWFLAG_NORMAL); drawpic(num_pos + '78 -4.5 0', "gfx/hud/sb_armor", '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); } - HUD_DrawXNum_Colored(num_pos, x, 24, hud_alpha_fg); // draw the combined health and armor + HUD_DrawXNum_Colored(num_pos, x, 3, 24, hud_alpha_fg); // draw the combined health and armor } else @@ -1365,21 +1366,64 @@ void HUD_HealthArmor(void) armor_pos = pos + eX * 0.5 * mySize_x; } - // armor - x = armor; - if (x > 0) + + if (mySize_x/mySize_y > 5) { - if (x > 45) - drawpic(armor_pos + eX * 0.35 * mySize_x, "gfx/hud/sb_armor", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + // armor + x = armor; + if (x < 10) + numbers = 1; + else if (x < 100) + numbers = 2; else - drawpic(armor_pos + eX * 0.35 * mySize_x, "gfx/hud/sb_armor", '1 1 0' * mySize_y, '1 1 1', (x+10)/55 * hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(armor_pos + eY * 0.25 * mySize_y, x, 0.5 * mySize_y, hud_alpha_fg); + numbers = 3; + + if (x > 0) + { + if (x > 45) + drawpic(pos, "gfx/hud/sb_armor", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + else + drawpic(pos, "gfx/hud/sb_armor", '1 1 0' * mySize_y, '1 1 1', (x+10)/55 * hud_alpha_fg, DRAWFLAG_NORMAL); + HUD_DrawXNum_Colored(pos + eX * mySize_y + eY * 0.25 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg); + } + + // health + x = health; + drawpic(pos + eX * mySize_x - eX * mySize_y, "gfx/hud/sb_health", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + HUD_DrawXNum_Colored(pos + eX * mySize_x - eX * 2.25 * mySize_y + eY * 0.25 * mySize_y, x, 3, 0.5 * mySize_y, hud_alpha_fg); } + else if (mySize_x/mySize_y > 3.2) + { + // armor + x = armor; + if (x < 10) + numbers = 1; + else if (x < 100) + numbers = 2; + else + numbers = 3; - // health - x = health; - drawpic(health_pos + eX * 0.35 * mySize_x, "gfx/hud/sb_health", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); - HUD_DrawXNum_Colored(health_pos + eY * 0.25 * mySize_y, x, 0.5 * mySize_y, hud_alpha_fg); + if (x > 0) + { + if (x > 45) + drawpic(pos + eX * 0.4 * mySize_y, "gfx/hud/sb_armor", '0.7 0.7 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + else + drawpic(pos + eX * 0.4 * mySize_y, "gfx/hud/sb_armor", '0.7 0.7 0' * mySize_y, '1 1 1', (x+10)/55 * hud_alpha_fg, DRAWFLAG_NORMAL); + HUD_DrawXNum_Colored(pos + eY * 0.55 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg); + } + + // health + x = health; + if (x < 10) + numbers = 1; + else if (x < 100) + numbers = 2; + else + numbers = 3; + + drawpic(pos + eX * mySize_x - eX * 1.22 * mySize_y, "gfx/hud/sb_health", '0.7 0.7 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + HUD_DrawXNum_Colored(pos + eX * mySize_x - eX * numbers * 0.5 * mySize_y + eY * 0.55 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg); + } } } -- 2.39.2