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

diff --git a/data/qcsrc/client/Main.qc b/data/qcsrc/client/Main.qc
index d93869b89e147a79b2f89d03789a0bb5f8302c0c..f353c4c23617bad3f72d556279b041128e4cdcd4 100644 (file)
--- a/data/qcsrc/client/Main.qc
+++ b/data/qcsrc/client/Main.qc
@@ -68,7 +68,7 @@ void CSQC_Init(void)
        ClientProgsDB = db_load("client.db");\r
        compressShortVector_init();\r
 \r
-       drawfont = 0;\r
+       drawfont = FONT_USER+1;\r
        menu_visible = FALSE;\r
        menu_show = menu_show_error;\r
        menu_action = menu_sub_null;\r

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 1ee371a25f367acfe1ad9da7260e037bbdba1319..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