r2280 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-04-01 14:18:13 -0400 (Sun, 01 Apr 2007)
New Revision: 2280

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/clientcommands.qc
Log:
fix netname the right way; check for empty string in say


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2007-04-01 13:32:27 UTC (rev 2279)
+++ trunk/data/qcsrc/server/cl_client.qc	2007-04-01 18:18:13 UTC (rev 2280)
@@ -1348,7 +1348,7 @@
 {
 	if(strlen(self.netname) > 0)
 		if(substring(self.netname, strlen(self.netname) - 1, 1) == "^")
-			self.netname = strzone(strcat(self.netname, " ")); // BROKEN COLORS can be annoying!
+			self.netname = strzone(strcat(substring(self.netname, 0, strlen(self.netname) - 1), " ")); // BROKEN COLORS can be annoying!
 
 	// version nagging
 	if(self.version_nagtime)

Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc	2007-04-01 13:32:27 UTC (rev 2279)
+++ trunk/data/qcsrc/server/clientcommands.qc	2007-04-01 18:18:13 UTC (rev 2280)
@@ -11,6 +11,10 @@
 	float flood;
 	entity head;
 
+	if(!teamsay)
+		if(substring(msgin, 0, 1) == " ")
+			msgin = substring(msgin, 1, strlen(msgin) - 1); // work around DP say bug (say_team does not have this!)
+
 	msgin = formatmessage(msgin);
 
 	if(msgin == "")
@@ -38,10 +42,6 @@
 	}
 	*/
 
-	if(!teamsay)
-		if(substring(msgin, 0, 1) == " ")
-			msgin = substring(msgin, 1, strlen(msgin) - 1); // work around DP say bug (say_team does not have this!)
-
 	if(cvar("g_chat_teamcolors"))
 		namestr = playername(source);
 	else