From 2e0fc3e4c16805de4403fa3b033155a508e6bc46 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Wed, 15 May 2024 05:01:42 +0300 Subject: [PATCH] engine: client: do not repeatedly check cl_charset value, use generic Con_UtfProcessChar --- engine/client/keys.c | 5 +---- engine/platform/sdl/events.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/engine/client/keys.c b/engine/client/keys.c index fda8ce62..919f6e0b 100644 --- a/engine/client/keys.c +++ b/engine/client/keys.c @@ -1055,10 +1055,7 @@ static qboolean OSK_KeyEvent( int key, int down ) break; } - if( !Q_stricmp( cl_charset.string, "utf-8" ) ) - ch = (unsigned char)osk.curbutton.val; - else - ch = Con_UtfProcessCharForce( (unsigned char)osk.curbutton.val ); + ch = Con_UtfProcessChar((byte)osk.curbutton.val ); if( !ch ) break; diff --git a/engine/platform/sdl/events.c b/engine/platform/sdl/events.c index 0f78cada..63f4551c 100644 --- a/engine/platform/sdl/events.c +++ b/engine/platform/sdl/events.c @@ -363,10 +363,7 @@ static void SDLash_InputEvent( SDL_TextInputEvent input ) { int ch; - if( !Q_stricmp( cl_charset.string, "utf-8" ) ) - ch = (unsigned char)*text; - else - ch = Con_UtfProcessCharForce( (unsigned char)*text ); + ch = Con_UtfProcessChar((byte)*text ); if( !ch ) continue;