From e0faf074c7c8a277c5f95b280b385725b964756c Mon Sep 17 00:00:00 2001 From: Spoike Date: Fri, 29 Nov 2013 15:59:02 +0000 Subject: [PATCH] stripped out my ancient form of in-engine translation. Implemented gettext style translation instead. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4547 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/server/server.h | 2 +- engine/server/sv_send.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/server/server.h b/engine/server/server.h index 8a1d3210c..a808e8bdf 100644 --- a/engine/server/server.h +++ b/engine/server/server.h @@ -1042,7 +1042,7 @@ void SV_MulticastProtExt(vec3_t origin, multicast_t to, int dimension_mask, int void SV_StartSound (int ent, vec3_t origin, int seenmask, int channel, char *sample, int volume, float attenuation, int pitchadj); void SVQ1_StartSound (float *origin, wedict_t *entity, int channel, char *sample, int volume, float attenuation, int pitchadj); -void SV_PrintToClient(client_t *cl, int level, char *string); +void SV_PrintToClient(client_t *cl, int level, const char *string); void SV_TPrintToClient(client_t *cl, int level, const char *string); void SV_StuffcmdToClient(client_t *cl, char *string); void VARGS SV_ClientPrintf (client_t *cl, int level, char *fmt, ...) LIKEPRINTF(3); diff --git a/engine/server/sv_send.c b/engine/server/sv_send.c index baeb23492..b3f50f9e9 100644 --- a/engine/server/sv_send.c +++ b/engine/server/sv_send.c @@ -160,12 +160,12 @@ void Con_TPrintf (translation_t stringnum, ...) { va_list argptr; char msg[MAXPRINTMSG]; - char *fmt; - + const char *fmt; + // add to redirected message if (sv_redirected) { - fmt = languagetext[stringnum][sv_redirectedlang]; + fmt = langtext(stringnum,sv_redirectedlang); va_start (argptr,stringnum); vsnprintf (msg,sizeof(msg)-1, fmt,argptr); va_end (argptr); @@ -176,7 +176,7 @@ void Con_TPrintf (translation_t stringnum, ...) return; } - fmt = languagetext[stringnum][svs.language]; + fmt = langtext(stringnum,svs.language); va_start (argptr,stringnum); vsnprintf (msg,sizeof(msg)-1, fmt,argptr);