From 1d558b33d6a574cdc4a62eb5019050c62210fa60 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sat, 13 Aug 2022 00:58:45 +0300 Subject: [PATCH] engine: client: don't let set unsupported con_charset --- engine/client/console.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/engine/client/console.c b/engine/client/console.c index bae1a35d..1ffc15ef 100644 --- a/engine/client/console.c +++ b/engine/client/console.c @@ -914,7 +914,7 @@ static int Con_DrawGenericChar( int x, int y, int number, rgba_t color ) if( !con.curFont || !con.curFont->valid ) return 0; - number = Con_UtfProcessChar(number); + number = Con_UtfProcessChar( number ); if( !number ) return 0; @@ -2403,11 +2403,21 @@ void Con_RunConsole( void ) FBitSet( cl_charset->flags, FCVAR_CHANGED ) ) { // update codepage parameters - g_codepage = 0; - if( !Q_stricmp( con_charset->string, "cp1251" ) ) + if( !Q_stricmp( con_charset->string, "cp1251" )) + { g_codepage = 1251; - else if( !Q_stricmp( con_charset->string, "cp1252" ) ) + } + else if( !Q_stricmp( con_charset->string, "cp1252" )) + { g_codepage = 1252; + } + else + { + Con_Printf( S_WARN "Unknown charset %s, defaulting to cp1252", con_charset->string ); + + Cvar_DirectSet( con_charset, "cp1252" ); + g_codepage = 1252; + } g_utf8 = !Q_stricmp( cl_charset->string, "utf-8" ); Con_InvalidateFonts();