From ce34b78113134ca07fa0c756e97ff3d941d4e048 Mon Sep 17 00:00:00 2001 From: smallmodel <15067410+smallmodel@users.noreply.github.com> Date: Thu, 10 Aug 2023 02:42:57 +0200 Subject: [PATCH] Added CL_LV_ConvertString Only CL messages are localized now (see comment) --- code/fgame/g_public.h | 1 + code/server/sv_game.c | 3 ++- code/sys/win_localization.cpp | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/fgame/g_public.h b/code/fgame/g_public.h index a55b4c2f..679252e3 100644 --- a/code/fgame/g_public.h +++ b/code/fgame/g_public.h @@ -231,6 +231,7 @@ typedef struct gameImport_s void ( *Error )( int level, const char *format, ... ); int ( *Milliseconds )( ); const char * ( *LV_ConvertString )( const char *string ); + const char * ( *CL_LV_ConvertString )( const char *string ); void * ( *Malloc )( size_t size ); void ( *Free )( void *ptr ); cvar_t * ( *Cvar_Get )( const char *varName, const char *varValue, int varFlags ); diff --git a/code/server/sv_game.c b/code/server/sv_game.c index 41fb9287..bd821ad3 100644 --- a/code/server/sv_game.c +++ b/code/server/sv_game.c @@ -1468,7 +1468,8 @@ void SV_InitGameProgs( void ) { import.Error = Com_Error; import.GetArchiveFileName = Com_GetArchiveFileName; import.Milliseconds = Sys_Milliseconds; - import.LV_ConvertString = Sys_LV_CL_ConvertString; + import.LV_ConvertString = Sys_LV_ConvertString; + import.CL_LV_ConvertString = Sys_LV_CL_ConvertString; import.SendServerCommand = SV_GameSendServerCommand; import.DropClient = SV_GameDropClient; diff --git a/code/sys/win_localization.cpp b/code/sys/win_localization.cpp index 986776fb..808993c3 100644 --- a/code/sys/win_localization.cpp +++ b/code/sys/win_localization.cpp @@ -46,7 +46,11 @@ void Sys_ShutLocalization() const char *Sys_LV_ConvertString( const char *var ) { - return g_localization->ConvertString( var ); + // + // Since 2.0, don't localize messages from fgame. + // The client already localize messages it receives + // + return var; } const char *Sys_LV_CL_ConvertString( const char *var )