From 10ae9e756dc3517ad89d490fbdd08e94e85b7c65 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Mon, 3 Apr 2006 00:37:41 +0000
Subject: [PATCH] sv_logspam_console - "minor" optimization to
 ServerConsoleEcho (don't do that escaping work if there can't be evil
 characters anyway)

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1214 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/gamec/cl_client.c     |  6 +++---
 data/qcsrc/server/gamec/ctf.c           |  2 +-
 data/qcsrc/server/gamec/g_damage.c      |  2 +-
 data/qcsrc/server/gamec/g_world.c       |  6 +++---
 data/qcsrc/server/gamec/miscfunctions.c | 22 ++++++++++++++--------
 data/qcsrc/server/gamec/teamplay.c      |  2 +-
 6 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/data/qcsrc/server/gamec/cl_client.c b/data/qcsrc/server/gamec/cl_client.c
index 22d5bd35b..8b331adb1 100644
--- a/data/qcsrc/server/gamec/cl_client.c
+++ b/data/qcsrc/server/gamec/cl_client.c
@@ -535,10 +535,10 @@ void ClientConnect (void)
 	if(cvar("sv_logspam_console"))
 	{
 		string s;
-		ServerConsoleEcho(strcat(":join:", ftos(self.playerid), ":", self.netname));
+		ServerConsoleEcho(strcat(":join:", ftos(self.playerid), ":", self.netname), TRUE);
 		s = strcat(":team:", ftos(self.playerid), ":");
 		s = strcat(s, ftos(self.team));
-		ServerConsoleEcho(s);
+		ServerConsoleEcho(s, FALSE);
 	}
 
 	//stuffcmd(self, "set tmpviewsize $viewsize \n");
@@ -618,7 +618,7 @@ void(entity e) DropFlag;
 void ClientDisconnect (void)
 {
 	if(cvar("sv_logspam_console"))
-		ServerConsoleEcho(strcat(":part:", ftos(self.playerid), ":", self.netname));
+		ServerConsoleEcho(strcat(":part:", ftos(self.playerid)), FALSE);
 	bprint ("^4",self.netname);
 	bprint ("^4 disconnected\n");
 
diff --git a/data/qcsrc/server/gamec/ctf.c b/data/qcsrc/server/gamec/ctf.c
index 56ae568e3..06146e572 100644
--- a/data/qcsrc/server/gamec/ctf.c
+++ b/data/qcsrc/server/gamec/ctf.c
@@ -52,7 +52,7 @@ void LogCTF(string mode, float flagteam, entity actor)
 	s = strcat(s, ":", ftos(flagteam));
 	if(actor != world)
 		s = strcat(s, ":", ftos(actor.playerid));
-	ServerConsoleEcho(s);
+	ServerConsoleEcho(s, FALSE);
 }
 
 void(entity e) RegenFlag =
diff --git a/data/qcsrc/server/gamec/g_damage.c b/data/qcsrc/server/gamec/g_damage.c
index b22ec86f1..5fbb7db36 100644
--- a/data/qcsrc/server/gamec/g_damage.c
+++ b/data/qcsrc/server/gamec/g_damage.c
@@ -59,7 +59,7 @@ void LogDeath(string mode, float deathtype, entity killer, entity killed)
 		s = strcat(s, "I");
 	if(killed.flagcarried != world)
 		s = strcat(s, "F");
-	ServerConsoleEcho(s);
+	ServerConsoleEcho(s, FALSE);
 }
 
 void Obituary (entity attacker, entity targ, float deathtype)
diff --git a/data/qcsrc/server/gamec/g_world.c b/data/qcsrc/server/gamec/g_world.c
index 2db77994e..4055bdb97 100644
--- a/data/qcsrc/server/gamec/g_world.c
+++ b/data/qcsrc/server/gamec/g_world.c
@@ -278,7 +278,7 @@ void worldspawn (void)
 	}
 
 	if(cvar("sv_logspam_console"))
-		ServerConsoleEcho(strcat(":gamestart:", GetMapname()));
+		ServerConsoleEcho(strcat(":gamestart:", GetMapname()), FALSE);
 
 	cvar_set("nextmap", "");
 }
@@ -623,7 +623,7 @@ void() DumpStats =
 			if(cvar("sv_logscores_file"))
 				fputs(file, strcat(s, other.netname, "\n"));
 			if(cvar("sv_logscores_console"))
-				ServerConsoleEcho(strcat(s, other.netname));
+				ServerConsoleEcho(strcat(s, other.netname), TRUE);
 		}
 		other = other.chain;
 	}
@@ -647,7 +647,7 @@ void() NextLevel =
 	gameover = TRUE;
 
 	if(cvar("sv_logspam_console"))
-		ServerConsoleEcho(":gameover");
+		ServerConsoleEcho(":gameover", FALSE);
 
 	intermission_running = 1;
 
diff --git a/data/qcsrc/server/gamec/miscfunctions.c b/data/qcsrc/server/gamec/miscfunctions.c
index 44476428a..7b03cf459 100644
--- a/data/qcsrc/server/gamec/miscfunctions.c
+++ b/data/qcsrc/server/gamec/miscfunctions.c
@@ -1,17 +1,23 @@
 string W_Name(float weaponid);
 float(float index) weapon_translateindextoflag;
 
-void(string s) ServerConsoleEcho =
+void(string s, float check_dangerous) ServerConsoleEcho =
 {
 	local string ch;
-	local string str;
-	localcmd(strcat("echo \"", s));
-	while(strlen(str))
+	localcmd("echo \"");
+	if(check_dangerous)
 	{
-		ch = substring(str, 0, 1);
-		if(ch != "\"" && ch != "\r" && ch != "\n")
-			localcmd(ch);
-		str = substring(str, 1, strlen(str) - 1);
+		while(strlen(s))
+		{
+			ch = substring(s, 0, 1);
+			if(ch != "\"" && ch != "\r" && ch != "\n")
+				localcmd(ch);
+			s = substring(s, 1, strlen(s) - 1);
+		}
+	}
+	else
+	{
+		localcmd(s);
 	}
 	localcmd("\"\n");
 }
diff --git a/data/qcsrc/server/gamec/teamplay.c b/data/qcsrc/server/gamec/teamplay.c
index 6bb055516..c94e5545e 100644
--- a/data/qcsrc/server/gamec/teamplay.c
+++ b/data/qcsrc/server/gamec/teamplay.c
@@ -74,7 +74,7 @@ void(entity pl) LogTeamchange =
 		return;
 	str = strcat(":team:", ftos(pl.playerid), ":");
 	str = strcat(str, ftos(pl.team)); 
-	ServerConsoleEcho(str);
+	ServerConsoleEcho(str, FALSE);
 }
 
 void ResetGameCvars()
-- 
2.39.2