From 8da9030779bf6ec8f078a85fbb9a4687cf7de7bb Mon Sep 17 00:00:00 2001 From: divverent Date: Sun, 24 Feb 2013 16:59:30 +0000 Subject: [PATCH] Lets add the ability to have silent messages sent to the chatbox, this is so that it can later replace the console output in Xonotic From: Samual git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11904 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=88e181a00bda65121e739f85d4d50674bc73bbce --- console.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/console.c b/console.c index 1123d094..634fd09c 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) + 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. { // play talk wav if (*msg == 1) @@ -1072,7 +1072,7 @@ void Con_MaskPrint(int additionalmask, const char *msg) { if(gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC) { - if(msg[1] == '\r' && cl.foundtalk2wav) + if(msg[1] == '\r' && cl.foundtalk2wav) // if carriage return is in the string, it is a tell message S_LocalSound ("sound/misc/talk2.wav"); else S_LocalSound ("sound/misc/talk.wav"); @@ -1085,8 +1085,13 @@ void Con_MaskPrint(int additionalmask, const char *msg) S_LocalSound ("sound/misc/talk.wav"); } } - mask = CON_MASK_CHAT; } + + // 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; + line[index++] = STRING_COLOR_TAG; line[index++] = '3'; msg++; -- 2.39.2