Fix health and armor positions with all fonts. Still more to fix however

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 78f7d2af0ab8f8895c639059548d1a8af48d9454..da8488bb2f024da3510ce17e83b66972054dc412 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -2986,21 +2986,20 @@ void Sbar_Draw (void)
 \r
                vector health_pos, armor_pos;\r
                health_pos = bottom - '43 58 0';\r
-               armor_pos = bottom - '52.5 68 0';\r
+               armor_pos = bottom - '43 68 0';\r
 \r
                // armor\r
                x = armor;\r
                if (x > 0)\r
                {\r
-                       drawpic(armor_pos + '0 -13.5 0', "gfx/hud/sb_armor", '16 16 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
-                       if(x < 100) armor_pos_x += 2.5; // always center\r
-                       if(x < 10) armor_pos_x += 2.5; // always center\r
+                       drawpic(armor_pos + '-8 -13.5 0', "gfx/hud/sb_armor", '16 16 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                       armor_pos -= '1 0 0' * stringwidth(ftos(x), FALSE, '12 12 0') * 0.5;\r
                        Sbar_DrawXNum_Colored(armor_pos, x, 12, sbar_alpha_fg);\r
                }\r
 \r
                // health\r
                x = health;\r
-               drawpic(health_pos + '0 16 0', "gfx/hud/sb_health", '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+               drawpic(health_pos + '-11 16 0', "gfx/hud/sb_health", '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                health_pos -= '1 0 0' * stringwidth(ftos(x), FALSE, '22 22 0') * 0.5;\r
                Sbar_DrawXNum_Colored(health_pos, x, 22, sbar_alpha_fg);\r
 \r