First attempt at implementing True Type font support for the sbar. All fonts will...

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

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index fb383ad753011e020f30f3c928919863c6ec3bd3..304f4e5b6858aff736de8698c4ec3baf1d944373 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -155,8 +155,8 @@ void Sbar_DrawXNum (vector pos, float num, float digits, float showminusplus, fl
        {\r
                tmp = substring(str, i, 1);\r
                if (stroke == 1)\r
-                       drawpic(pos, strcat("gfx/hud/num_", tmp, "_stroke"), vsize, rgb, alpha, dflags);\r
-               drawpic(pos, strcat("gfx/hud/num_", tmp), vsize, num_color, alpha, dflags);\r
+                       drawstring(pos, tmp, vsize, rgb, alpha, dflags);\r
+               drawstring(pos, tmp, vsize, num_color, alpha, dflags);\r
                pos_x += lettersize;\r
        }\r
 }\r
@@ -3070,19 +3070,18 @@ void Sbar_Draw (void)
                                        drawpic(pos - '98 18 0', GetAmmoPicture(i), '20 20 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                                        weapon_clipsize = getstati(STAT_WEAPON_CLIPSIZE);\r
 \r
+                                       // if the weapon we're holding is reloadable, show both its ammo and load\r
                                        if(weapon_clipsize)\r
                                        {\r
                                                weapon_clipload = getstati(STAT_WEAPON_CLIPLOAD);\r
-                                               if(weapon_clipload < 0)\r
+                                               if(weapon_clipload < 0) // we're reloading\r
                                                        drawstring(pos - '124 23 0', "- -", '16 16 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                                                else\r
                                                        Sbar_DrawXNum(pos - '132 23 0', weapon_clipload, 2, 0, 16, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                                                Sbar_DrawXNum(pos - '137 7 0', a, 3, 0, 12, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                                        }\r
                                        else\r
-                                       {\r
                                                Sbar_DrawXNum(pos - '144 16 0', a, 3, 0, 16, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
-                                       }\r
                                }\r
                        }\r
                }\r