Revert back to old drawstring method. It's just some components that need a better...

diff --git a/data/qcsrc/client/miscfunctions.qc b/data/qcsrc/client/miscfunctions.qc
index 885d1eda408a5d9e8cc89d6193175ef05e916059..0d72bfec0ec4d9be8e9326f88c87a083170455fb 100644 (file)
--- a/data/qcsrc/client/miscfunctions.qc
+++ b/data/qcsrc/client/miscfunctions.qc
@@ -481,28 +481,6 @@ void drawpic_expanding_two(vector position, string pic, vector scale, vector rgb
        drawpic(position, pic, scale, rgb, alpha * fadelerp, flag);\r
 }\r
 \r
-// drawstring wrapper to draw a string as large as possible with preserved aspect ratio into a box\r
-void drawstring_aspect(vector pos, string text, vector sz, vector color, float alpha, float drawflag) {\r
-       vector textsize;\r
-       textsize = '1 0 0' * stringwidth(text, FALSE, '1 1 1' * sz_y) + '1 0 0' * sz_y;\r
-\r
-       float textaspect;\r
-       textaspect = textsize_x/textsize_y;\r
-\r
-       vector oldsz;\r
-       oldsz = sz;\r
-       float aspect;\r
-       aspect = sz_x/sz_y;\r
-\r
-       if(aspect > textaspect) {\r
-               sz_x = sz_y * textaspect;\r
-               drawstring(pos + '1 0 0' * (oldsz_x - sz_x) * 0.5, text, '1 1 0' * sz_y, color, alpha, drawflag);\r
-       } else {\r
-               sz_y = sz_x / textaspect; \r
-               drawstring(pos + '0 1 0' * (oldsz_y - sz_y) * 0.5, text, '1 1 0' * sz_y, color, alpha, drawflag);\r
-       }\r
-}\r
-\r
 vector drawfontscale;\r
 void drawstring_expanding(vector position, string text, vector scale, vector rgb, float alpha, float flag, float fadelerp)\r
 {\r

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index aff0939d31fb1e50b9cbded89c3597a5b8d7db88..78f7d2af0ab8f8895c639059548d1a8af48d9454 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_aspect(pos, str, vsize, rgb, alpha, dflags);\r
+       drawstring(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 - '55 58 0';\r
+               health_pos = bottom - '43 58 0';\r
                armor_pos = bottom - '52.5 68 0';\r
 \r
                // armor\r