From 16f870ddeae74d6702496afab7d0306db76e8974 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Mon, 3 Apr 2006 00:30:43 +0000
Subject: [PATCH] sv_logspam_console - added game start, game over lines...
 moved ServerConsoleEcho to where it belongs.

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1213 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/gamec/g_damage.c      |  6 +++---
 data/qcsrc/server/gamec/g_world.c       | 22 +++++++---------------
 data/qcsrc/server/gamec/miscfunctions.c | 16 +++++++++++++++-
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/data/qcsrc/server/gamec/g_damage.c b/data/qcsrc/server/gamec/g_damage.c
index a9c1e780b..b22ec86f1 100644
--- a/data/qcsrc/server/gamec/g_damage.c
+++ b/data/qcsrc/server/gamec/g_damage.c
@@ -54,11 +54,11 @@ void LogDeath(string mode, float deathtype, entity killer, entity killed)
 		w = killed.switchweapon;
 	s = strcat(s, ftos(weapon_translateindextoflag(w)));
 	if(time < killed.strength_finished)
-		s = strcat(s, "s");
+		s = strcat(s, "S");
 	if(time < killed.invincible_finished)
-		s = strcat(s, "i");
+		s = strcat(s, "I");
 	if(killed.flagcarried != world)
-		s = strcat(s, "f");
+		s = strcat(s, "F");
 	ServerConsoleEcho(s);
 }
 
diff --git a/data/qcsrc/server/gamec/g_world.c b/data/qcsrc/server/gamec/g_world.c
index 0cecfdc6b..2db77994e 100644
--- a/data/qcsrc/server/gamec/g_world.c
+++ b/data/qcsrc/server/gamec/g_world.c
@@ -1,3 +1,4 @@
+string GetMapname();
 
 void worldspawn (void)
 {
@@ -276,6 +277,9 @@ void worldspawn (void)
 		head = nextent(head);
 	}
 
+	if(cvar("sv_logspam_console"))
+		ServerConsoleEcho(strcat(":gamestart:", GetMapname()));
+
 	cvar_set("nextmap", "");
 }
 
@@ -581,21 +585,6 @@ RULES
 ===============================================================================
 */
 
-void(string s) ServerConsoleEcho =
-{
-	local string ch;
-	local string str;
-	localcmd(strcat("echo \"", s));
-	while(strlen(str))
-	{
-		ch = substring(str, 0, 1);
-		if(ch != "\"" && ch != "\r" && ch != "\n")
-			localcmd(ch);
-		str = substring(str, 1, strlen(str) - 1);
-	}
-	localcmd("\"\n");
-}
-
 void() DumpStats =
 {
 	local float file;
@@ -657,6 +646,9 @@ void() NextLevel =
 {
 	gameover = TRUE;
 
+	if(cvar("sv_logspam_console"))
+		ServerConsoleEcho(":gameover");
+
 	intermission_running = 1;
 
 // enforce a wait time before allowing changelevel
diff --git a/data/qcsrc/server/gamec/miscfunctions.c b/data/qcsrc/server/gamec/miscfunctions.c
index e12fa50c8..44476428a 100644
--- a/data/qcsrc/server/gamec/miscfunctions.c
+++ b/data/qcsrc/server/gamec/miscfunctions.c
@@ -1,7 +1,21 @@
 string W_Name(float weaponid);
-void(string s) ServerConsoleEcho;
 float(float index) weapon_translateindextoflag;
 
+void(string s) ServerConsoleEcho =
+{
+	local string ch;
+	local string str;
+	localcmd(strcat("echo \"", s));
+	while(strlen(str))
+	{
+		ch = substring(str, 0, 1);
+		if(ch != "\"" && ch != "\r" && ch != "\n")
+			localcmd(ch);
+		str = substring(str, 1, strlen(str) - 1);
+	}
+	localcmd("\"\n");
+}
+
 float math_mod(float a, float b)
 {
 	return a - (floor(a / b) * b);
-- 
2.39.2