Re-write the centering code for health. The previous was a failure, and most HUD...

[voretournament/voretournament.git] / data / qcsrc / client / sbar.qc

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index d6a40728d6cad6526714ea38ecbe7bf7db5b4c7c..aff0939d31fb1e50b9cbded89c3597a5b8d7db88 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -123,7 +123,7 @@ void Sbar_DrawXNum (vector pos, float num, float digits, float showminusplus, fl
                pos_x += lettersize / 2;\r
        }\r
 \r
-       drawstring(pos, str, vsize, rgb, alpha, dflags);\r
+       drawstring_aspect(pos, str, vsize, rgb, alpha, dflags);\r
 }\r
 \r
 void Sbar_DrawXNum_Colored (vector pos, float x, float lettersize, float alpha)\r
@@ -2985,7 +2985,7 @@ void Sbar_Draw (void)
                }\r
 \r
                vector health_pos, armor_pos;\r
-               health_pos = bottom - '60 58 0';\r
+               health_pos = bottom - '55 58 0';\r
                armor_pos = bottom - '52.5 68 0';\r
 \r
                // armor\r
@@ -3000,9 +3000,8 @@ void Sbar_Draw (void)
 \r
                // health\r
                x = health;\r
-               drawpic(health_pos + '4.5 16 0', "gfx/hud/sb_health", '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
-               if(x < 100) health_pos_x += 5; // always center\r
-               if(x < 10) health_pos_x += 5; // always center\r
+               drawpic(health_pos + '0 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
                // ammo\r