From 91d66990cd084b823c58e29342398f4ea9551857 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Sun, 2 May 2010 11:21:03 +0300 Subject: [PATCH] health/armor fixes, inventory fixes --- gfx/hud/sb_armor.tga | Bin 31681 -> 31116 bytes gfx/hud/sb_health.tga | Bin 20271 -> 20271 bytes qcsrc/client/hud.qc | 60 +++++++++++++++--------------------------- 3 files changed, 21 insertions(+), 39 deletions(-) diff --git a/gfx/hud/sb_armor.tga b/gfx/hud/sb_armor.tga index 669bbc84c6e6138a407aac98ccd0e3371f02171f..4801835a5df71a8e4c2057fc54cc82f5bb5e432f 100644 GIT binary patch delta 1279 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�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 E18s!pD*ylh literal 20271 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 b9{#O=qIuzlrR$ciUNvFUqNOVqPE7n4M~mny diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 241df8fb9..4a5a2d7bb 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -560,6 +560,12 @@ vector HUD_Panel_CheckLimitSize(float id, vector mySize) mySize_x = max(mySize_y * (1/10), mySize_x); // at least 1/10 * height mySize_y = max(mySize_x * (1/26), mySize_y); // at least 1/26 * width break; + case 1: + mySize_x = max(mySize_y * 0.7, mySize_x); // at least 0.7 * height + break; + case 3: + mySize_x = max(mySize_y * 2, mySize_x); // at least 2 * height + break; } return mySize; } @@ -1329,6 +1335,7 @@ void HUD_HealthArmor(void) health = getstati(STAT_HEALTH); float numbers; + // TODO! if(hud_hudselector == 2) // combined health and armor display { vector v; @@ -1357,11 +1364,11 @@ void HUD_HealthArmor(void) { vector health_pos, armor_pos; + // TODO! if (hud_hudselector == 0) { // old style layout with armor left of health armor_pos = pos; health_pos = pos + eX * 0.5 * mySize_x; - } - else { + } else { health_pos = pos; armor_pos = pos + eX * 0.5 * mySize_x; } @@ -1371,12 +1378,7 @@ void HUD_HealthArmor(void) { // armor x = armor; - if (x < 10) - numbers = 1; - else if (x < 100) - numbers = 2; - else - numbers = 3; + numbers = strlen(ftos(x)); if (x > 0) { @@ -1390,18 +1392,13 @@ void HUD_HealthArmor(void) // 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); + HUD_DrawXNum_Colored(pos + eX * mySize_x - eX * 2.5 * 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; + numbers = strlen(ftos(x)); if (x > 0) { @@ -1414,47 +1411,32 @@ void HUD_HealthArmor(void) // health x = health; - if (x < 10) - numbers = 1; - else if (x < 100) - numbers = 2; - else - numbers = 3; + numbers = strlen(ftos(x)); - 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); + drawpic(pos + eX * mySize_x - eX * 1.1 * 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); } else { // armor x = armor; - if (x < 10) - numbers = 1; - else if (x < 100) - numbers = 2; - else - numbers = 3; + numbers = strlen(ftos(x)); 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); + drawpic(pos, "gfx/hud/sb_armor", '0.5 0.5 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); + drawpic(pos, "gfx/hud/sb_armor", '0.5 0.5 0' * mySize_y, '1 1 1', (x+10)/55 * hud_alpha_fg, DRAWFLAG_NORMAL); + HUD_DrawXNum_Colored(pos + eX * 0.5 * 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; + numbers = strlen(ftos(x)); - 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); + drawpic(pos + eY * 0.5 * mySize_y, "gfx/hud/sb_health", '0.5 0.5 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); + HUD_DrawXNum_Colored(pos + eX * 0.5 * mySize_y + eY * 0.5 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg); } } } -- 2.39.2