From 2d30334878d91450e319ce4959ab4b468e655910 Mon Sep 17 00:00:00 2001 From: qqshka Date: Mon, 10 Mar 2008 22:11:14 +0000 Subject: [PATCH] mmm, some changes to how QTV chat looks, added qtv_gamechatprefix. Well, I found some issues, but think about it later. --- cl_parse.c | 23 ++++++++++++++++++++++- qtv.c | 2 ++ qtv.h | 1 + 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/cl_parse.c b/cl_parse.c index 2537db674..f55ff8396 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -2477,7 +2477,28 @@ void CL_ParsePrint (void) if (qtvtmp) { - snprintf(qtvstr, sizeof(qtvstr), "%s%s\n", TP_ParseFunChars(qtv_chatprefix.string, false), qtvtmp); + char name[1024] = {0}, *column; + + column = strchr(qtvtmp, ':'); + + if (!column) + { + // this must not be the case, but... + column = qtvtmp; + name[0] = 0; + } + else + { + strlcpy(name, qtvtmp, bound(1, column - qtvtmp + 1, (int)sizeof(name))); + } + + if (!strncmp(s0, "#0:qtv_say_game:", sizeof("#0:qtv_say_game:")-1)) + snprintf(qtvstr, sizeof(qtvstr), "%s%s%s\n", TP_ParseFunChars(qtv_gamechatprefix.string, false), name, column); + else if (!strncmp(s0, "#0:qtv_say_team_game:", sizeof("#0:qtv_say_team_game:")-1)) + snprintf(qtvstr, sizeof(qtvstr), "%s(%s)%s\n", TP_ParseFunChars(qtv_gamechatprefix.string, false), name, column); + else + snprintf(qtvstr, sizeof(qtvstr), "%s%s%s\n", TP_ParseFunChars(qtv_chatprefix.string, false), name, column); + s0 = qtvstr; } // } diff --git a/qtv.c b/qtv.c index 4fd2aeb2d..945518584 100644 --- a/qtv.c +++ b/qtv.c @@ -12,6 +12,7 @@ cvar_t qtv_buffertime = {"qtv_buffertime", "0.5"}; cvar_t qtv_chatprefix = {"qtv_chatprefix", "$[{QTV}$] "}; +cvar_t qtv_gamechatprefix = {"qtv_gamechatprefix", "$[{QTV>game}$] "}; cvar_t qtv_skipchained = {"qtv_skipchained", "1"}; cvar_t qtv_adjustbuffer = {"qtv_adjustbuffer", "0"}; cvar_t qtv_adjustminspeed = {"qtv_adjustminspeed", "0"}; @@ -31,6 +32,7 @@ void QTV_Init(void) Cvar_Register(&qtv_buffertime); Cvar_Register(&qtv_chatprefix); + Cvar_Register(&qtv_gamechatprefix); Cvar_Register(&qtv_skipchained); Cvar_Register(&qtv_adjustbuffer); Cvar_Register(&qtv_adjustminspeed); diff --git a/qtv.h b/qtv.h index dcd834c23..39164ae92 100644 --- a/qtv.h +++ b/qtv.h @@ -63,6 +63,7 @@ void Parse_QtvUserList(char *s); extern cvar_t qtv_buffertime; extern cvar_t qtv_chatprefix; +extern cvar_t qtv_gamechatprefix; extern cvar_t qtv_skipchained; extern cvar_t qtv_adjustbuffer; extern cvar_t qtv_adjustminspeed;