From 71babbcf77822f1a04c06bdc7d3ff646ddf788b4 Mon Sep 17 00:00:00 2001 From: divverent Date: Sun, 24 Feb 2013 16:59:33 +0000 Subject: [PATCH] Fix bug with cl_parse.c putting extra \2 in the Con_Printf() line From: Samual Lenks git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11905 d7cf8633-e32d-0410-b094-e92efae38249 --- cl_parse.c | 4 ++-- console.c | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/cl_parse.c b/cl_parse.c index 53bc140c..a97ca0f6 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -1744,7 +1744,7 @@ static void CL_ParseServerInfo (void) cl.movevars_airaccel_sideways_friction = 0; // seperate the printfs so the server message can have a color - Con_Printf("\n\n<===================================>\n\n\2%s\n", str); + Con_Printf("\n\n<===================================>\n\n%s\n", str); // check memory integrity Mem_CheckSentinelsGlobal(); @@ -1800,7 +1800,7 @@ static void CL_ParseServerInfo (void) // seperate the printfs so the server message can have a color if (cls.protocol != PROTOCOL_NEHAHRAMOVIE) // no messages when playing the Nehahra movie - Con_Printf("\n<===================================>\n\n\2%s\n", str); + Con_Printf("\n<===================================>\n\n%s\n", str); // check memory integrity Mem_CheckSentinelsGlobal(); diff --git a/console.c b/console.c index 634fd09c..5724d75e 100644 --- a/console.c +++ b/console.c @@ -1063,7 +1063,7 @@ void Con_MaskPrint(int additionalmask, const char *msg) line[index++] = STRING_COLOR_DEFAULT + '0'; // special color codes for chat messages must always come first // for Con_PrintToHistory to work properly - if (*msg == 1 || *msg == 2 || *msg == 3) // Adding 3 for now since I don't know if 2 is used for anything. Can be fixed later if 2 isn't used. + if (*msg == 1 || *msg == 2) { // play talk wav if (*msg == 1) @@ -1086,12 +1086,7 @@ void Con_MaskPrint(int additionalmask, const char *msg) } } } - - // Send to chatbox for say/tell (1) and messages (3) - // 3 is just so that a message can be sent to the chatbox without a sound. - if (*msg == 1 || *msg == 3) - mask = CON_MASK_CHAT; - + mask = CON_MASK_CHAT; line[index++] = STRING_COLOR_TAG; line[index++] = '3'; msg++; -- 2.39.2