fix alignment of fps counter with ft2 fonts, and other alignment issues

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index 51efb204ecae9c3668530f210a80ed4813081d69..52d395b925a4ab56f99b7079945c19949843344a 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -159,7 +159,7 @@ void SCR_DrawCenterString (void)
                // scan the number of characters on the line, not counting color codes
                char *newline = strchr(start, '\n');
                int l = newline ? (newline - start) : (int)strlen(start);
-               float width = DrawQ_TextWidth_Font(start, l, false, FONT_CENTERPRINT) * 8;
+               float width = DrawQ_TextWidth_Font_Size(start, l, 8, 8, false, FONT_CENTERPRINT);
 
                x = (int) (vid_conwidth.integer - width)/2;
                if (l > 0)
@@ -468,7 +468,7 @@ static int SCR_DrawQWDownload(int offset)
        else
                dpsnprintf(temp, sizeof(temp), "Downloading %s %3i%% (%i/%i) at %i bytes/s\n", cls.qw_downloadname, cls.qw_downloadpercent, cls.qw_downloadmemorycursize, cls.qw_downloadmemorymaxsize, cls.qw_downloadspeedrate);
        len = (int)strlen(temp);
-       x = (vid_conwidth.integer - DrawQ_TextWidth_Font(temp, len, true, FONT_INFOBAR) * size) / 2;
+       x = (vid_conwidth.integer - DrawQ_TextWidth_Font_Size(temp, len, size, size, true, FONT_INFOBAR)) / 2;
        y = vid_conheight.integer - size - offset;
        DrawQ_Fill(0, y, vid_conwidth.integer, size, 0, 0, 0, cls.signon == SIGNONS ? 0.5 : 1, 0);
        DrawQ_String_Font(x, y, temp, len, size, size, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
@@ -486,7 +486,7 @@ static int SCR_DrawInfobarString(int offset)
        float size = 8;
 
        len = (int)strlen(scr_infobarstring);
-       x = (vid_conwidth.integer - DrawQ_TextWidth_Font(scr_infobarstring, len, false, FONT_INFOBAR) * size) / 2;
+       x = (vid_conwidth.integer - DrawQ_TextWidth_Font_Size(scr_infobarstring, len, size, size, false, FONT_INFOBAR)) / 2;
        y = vid_conheight.integer - size - offset;
        DrawQ_Fill(0, y, vid_conwidth.integer, size, 0, 0, 0, cls.signon == SIGNONS ? 0.5 : 1, 0);
        DrawQ_String_Font(x, y, scr_infobarstring, len, size, size, 1, 1, 1, 1, 0, NULL, false, FONT_INFOBAR);
@@ -519,7 +519,7 @@ static int SCR_DrawCurlDownload(int offset)
        if(addinfo)
        {
                len = (int)strlen(addinfo);
-               x = (vid_conwidth.integer - DrawQ_TextWidth_Font(addinfo, len, true, FONT_INFOBAR) * size) / 2;
+               x = (vid_conwidth.integer - DrawQ_TextWidth_Font_Size(addinfo, len, size, size, true, FONT_INFOBAR)) / 2;
                DrawQ_Fill(0, y - size, vid_conwidth.integer, size, 1, 1, 1, cls.signon == SIGNONS ? 0.8 : 1, 0);
                DrawQ_String_Font(x, y - size, addinfo, len, size, size, 0, 0, 0, 1, 0, NULL, true, FONT_INFOBAR);
        }
@@ -533,7 +533,7 @@ static int SCR_DrawCurlDownload(int offset)
                else
                        dpsnprintf(temp, sizeof(temp), "Downloading %s ...  %5.1f%% @ %.1f KiB/s\n", downinfo[i].filename, 100.0 * downinfo[i].progress, downinfo[i].speed / 1024.0);
                len = (int)strlen(temp);
-               x = (vid_conwidth.integer - DrawQ_TextWidth_Font(temp, len, true, FONT_INFOBAR) * size) / 2;
+               x = (vid_conwidth.integer - DrawQ_TextWidth_Font_Size(temp, len, size, size, true, FONT_INFOBAR)) / 2;
                DrawQ_Fill(0, y + i * size, vid_conwidth.integer, size, 0, 0, 0, cls.signon == SIGNONS ? 0.5 : 1, 0);
                DrawQ_String_Font(x, y + i * size, temp, len, size, size, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
        }
@@ -1817,7 +1817,7 @@ static float SCR_DrawLoadingStack_r(loadingscreenstack_t *s, float y)
                if(!s->prev || strcmp(s->msg, s->prev->msg))
                {
                        len = strlen(s->msg);
-                       x = (vid_conwidth.integer - DrawQ_TextWidth_Font(s->msg, len, true, FONT_INFOBAR) * size) / 2;
+                       x = (vid_conwidth.integer - DrawQ_TextWidth_Font_Size(s->msg, len, size, size, true, FONT_INFOBAR)) / 2;
                        y -= size;
                        DrawQ_Fill(0, y, vid_conwidth.integer, size, 0, 0, 0, 1, 0);
                        DrawQ_String_Font(x, y, s->msg, len, size, size, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
@@ -1828,7 +1828,7 @@ static float SCR_DrawLoadingStack_r(loadingscreenstack_t *s, float y)
        if(s)
        {
                len = strlen(s->msg);
-               x = (vid_conwidth.integer - DrawQ_TextWidth_Font(s->msg, len, true, FONT_INFOBAR) * size) / 2;
+               x = (vid_conwidth.integer - DrawQ_TextWidth_Font_Size(s->msg, len, size, size, true, FONT_INFOBAR)) / 2;
                y -= size;
                DrawQ_Fill(0, y, vid_conwidth.integer, size, 0, 0, 0, 1, 0);
                DrawQ_String_Font(x, y, s->msg, len, size, size, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);