From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sun, 2 May 2010 07:20:19 +0000 (+0300)
Subject: horizontal layout for health/armor panel
X-Git-Tag: xonotic-v0.1.0preview~541^2~220
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3671fa5fe70482668adb62bb6847c0a9438cfe60;p=xonotic%2Fxonotic-data.pk3dir.git

horizontal layout for health/armor panel
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 31d7e9ccd..241df8fb9 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1412,6 +1412,38 @@ void HUD_HealthArmor(void)
 				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);
+		}
+		else
+		{
+			// armor
+			x = armor;
+			if (x < 10)
+				numbers = 1;
+			else if (x < 100)
+				numbers = 2;
+			else
+				numbers = 3;
+
+			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)