improve text word wrapping

[xonotic/darkplaces.git] / console.c

diff --git a/console.c b/console.c
index 4adf5af4bbe4133cdcf5661cb33ca5cba62ccd94..8bb622aef09866685854faf3111a130ef981897c 100644 (file)
--- a/console.c
+++ b/console.c
@@ -1422,14 +1422,8 @@ float Con_WordWidthFunc(void *passthrough, const char *w, size_t *length, float
                ti->colorindex = -1;
                return ti->fontsize * ti->font->maxwidth;
        }
-       /*
        if(maxWidth >= 0)
-               return DrawQ_TextWidth_Font_UntilWidth(w, length, false, ti->font, maxWidth / ti->fontsize) * ti->fontsize;
-       else if(maxWidth == -1)
-               return DrawQ_TextWidth_Font(w, *length, false, ti->font) * ti->fontsize;
-       */
-       if(maxWidth >= 0)
-               return DrawQ_TextWidth_Font_UntilWidth_Size(w, ti->fontsize, ti->fontsize, length, false, ti->font, maxWidth);
+               return DrawQ_TextWidth_Font_UntilWidth_Size(w, ti->fontsize, ti->fontsize, length, false, ti->font, -maxWidth); // -maxWidth: we want at least one char
        else if(maxWidth == -1)
                return DrawQ_TextWidth_Font_Size(w, ti->fontsize, ti->fontsize, *length, false, ti->font);
        else