From edde871eb5cf1b32d3efe1ff03a39fde8c69c494 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sat, 17 Nov 2018 01:26:57 +0300 Subject: [PATCH] console: fix console font scale for Quake I fonts, fix drawing arrows in console for Quake I --- engine/client/console.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/engine/client/console.c b/engine/client/console.c index d62f475d..4fd5acee 100644 --- a/engine/client/console.c +++ b/engine/client/console.c @@ -537,7 +537,7 @@ static qboolean Con_LoadFixedWidthFont( const char *fontname, cl_font_t *font ) if( font->hFontTexture && fontWidth != 0 ) { - font->charHeight = fontWidth / 16; + font->charHeight = fontWidth / 16 * con_fontscale->value; font->type = FONT_FIXED; // build fixed rectangles @@ -547,7 +547,7 @@ static qboolean Con_LoadFixedWidthFont( const char *fontname, cl_font_t *font ) font->fontRc[i].right = font->fontRc[i].left + fontWidth / 16; font->fontRc[i].top = (i / 16) * (fontWidth / 16); font->fontRc[i].bottom = font->fontRc[i].top + fontWidth / 16; - font->charWidths[i] = fontWidth / 16; + font->charWidths[i] = fontWidth / 16 * con_fontscale->value; } font->valid = true; } @@ -871,8 +871,9 @@ static int Con_DrawGenericChar( int x, int y, int number, rgba_t color ) return 0; number = Con_UtfProcessChar(number); - if( number < 32 ) + if( !number ) return 0; + if( y < -con.curFont->charHeight ) return 0;