remove a useless arg of drawstring_aspect, also implement drawcolorcodedstring_aspect

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / miscfunctions.qc

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index 74830223d9306f31cead7823a6f3ff590b593e7f..23f88868bcb5600a7decd1eaf03ae89b3efd57ef 100644 (file)
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -483,9 +483,9 @@ void drawpic_expanding_two(vector position, string pic, vector scale, vector rgb
 }
 
 // drawstring wrapper to draw a string as large as possible with preserved aspect ratio into a box
-void drawstring_aspect(vector pos, string text, vector sz, float fontsize, vector color, float alpha, float drawflag) {
+void drawstring_aspect(vector pos, string text, vector sz, vector color, float alpha, float drawflag) {
        vector textsize;
-       textsize = eX * stringwidth(text, FALSE, '1 1 0' * fontsize) + eY * fontsize;
+       textsize = eX * stringwidth(text, FALSE, '1 1 1' * sz_y) + eY * sz_y;
        
        float textaspect;
        textaspect = textsize_x/textsize_y;
@@ -504,6 +504,28 @@ void drawstring_aspect(vector pos, string text, vector sz, float fontsize, vecto
        }
 }
 
+// drawstring wrapper to draw a colorcodedstring as large as possible with preserved aspect ratio into a box
+void drawcolorcodedstring_aspect(vector pos, string text, vector sz, float alpha, float drawflag) {
+       vector textsize;
+       textsize = eX * stringwidth(text, TRUE, '1 1 1' * sz_y) + eY * sz_y;
+       
+       float textaspect;
+       textaspect = textsize_x/textsize_y;
+
+       vector oldsz;
+       oldsz = sz;
+       float aspect;
+       aspect = sz_x/sz_y;
+
+       if(aspect > textaspect) {
+               sz_x = sz_y * textaspect;
+               drawcolorcodedstring(pos + eX * (oldsz_x - sz_x) * 0.5, text, '1 1 0' * sz_y, alpha, drawflag);
+       } else {
+               sz_y = sz_x / textaspect; 
+               drawcolorcodedstring(pos + eY * (oldsz_y - sz_y) * 0.5, text, '1 1 0' * sz_y, alpha, drawflag);
+       }
+}
+
 vector drawfontscale;
 void drawstring_expanding(vector position, string text, vector scale, vector rgb, float alpha, float flag, float fadelerp)
 {