From 30cf91679a3f0d8de407a01ea6c669c9ae134e70 Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 29 Apr 2005 02:40:37 +0000
Subject: [PATCH] moved some Con_PrintToHistory code into Con_Print and
 reenabled talk.wav in GAME_NEXUIZ

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5210 d7cf8633-e32d-0410-b094-e92efae38249
---
 console.c | 40 ++++++++++++++++------------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/console.c b/console.c
index c218a1de..aabc53ea 100644
--- a/console.c
+++ b/console.c
@@ -444,23 +444,11 @@ All console printing must go through this in order to be displayed
 If no console is visible, the notify window will pop up.
 ================
 */
-void Con_PrintToHistory(const char *txt)
+void Con_PrintToHistory(const char *txt, int mask)
 {
-	int y, c, l, mask;
+	int y, c, l;
 	static int cr;
 
-	if (txt[0] == 1 || txt[0] == 2)
-	{
-		if (gamemode == GAME_NEXUIZ)
-			mask = 0;
-		else
-			mask = 128;		// go to colored text
-		txt++;
-	}
-	else
-		mask = 0;
-
-
 	while ( (c = *txt) )
 	{
 	// count word length
@@ -517,11 +505,6 @@ void Con_PrintToHistory(const char *txt)
 		}
 
 	}
-
-	if( txt[0] == 1 ) {
-		// play talk wav
-		S_LocalSound ("sound/misc/talk.wav");
-	}
 }
 
 /* The translation table between the graphical font and plain ASCII  --KB */
@@ -573,6 +556,7 @@ extern cvar_t timeformat;
 extern qboolean sys_nostdout;
 void Con_Print(const char *msg)
 {
+	int mask = 0;
 	static int index = 0;
 	static char line[16384];
 
@@ -586,14 +570,22 @@ void Con_Print(const char *msg)
 			// for Con_PrintToHistory to work properly
 			if (*msg <= 2)
 			{
+				if (*msg == 1)
+				{
+					// play talk wav
+					S_LocalSound ("sound/misc/talk.wav");
+				}
 				if (gamemode == GAME_NEXUIZ)
 				{
 					line[index++] = '^';
 					line[index++] = '3';
-					msg++;
 				}
 				else
-					line[index++] = *msg++;
+				{
+					// go to colored text
+					mask = 128;
+				}
+				msg++;
 			}
 			// store timestamp
 			for (;*timestamp;index++, timestamp++)
@@ -609,9 +601,6 @@ void Con_Print(const char *msg)
 			line[index] = 0;
 			// send to log file
 			Log_ConPrint(line);
-			// send to scrollable buffer
-			if (con_initialized && cls.state != ca_dedicated)
-				Con_PrintToHistory(line);
 			// send to terminal or dedicated server window
 			if (!sys_nostdout)
 			{
@@ -620,6 +609,9 @@ void Con_Print(const char *msg)
 					*p = qfont_table[*p];
 				Sys_PrintToTerminal(line);
 			}
+			// send to scrollable buffer
+			if (con_initialized && cls.state != ca_dedicated)
+				Con_PrintToHistory(line, mask);
 			// empty the line buffer
 			index = 0;
 		}
-- 
2.39.2