[nexuiz-commits] r6739 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-05-17 15:40:49 -0400 (Sun, 17 May 2009)
New Revision: 6739

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/cl_player.qc
Log:
now the trolls have done it. An official "mute" and "unmute" command.


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-05-16 19:29:09 UTC (rev 6738)
+++ trunk/data/defaultNexuiz.cfg	2009-05-17 19:40:49 UTC (rev 6739)
@@ -1535,6 +1535,9 @@
 
 set g_hitplots 0 "when set to 1, hitplots are stored by the server to provide a means of proving that a triggerbot was used"
 
+alias mute "prvm_edictset server $1 muted 1" // I am lazy and not making an actual command of this
+alias unmute "prvm_edictset server $1 muted 0" // dito
+
 rcon_secure 1
 
 set menu_updatecheck 1

Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2009-05-16 19:29:09 UTC (rev 6738)
+++ trunk/data/qcsrc/server/cl_player.qc	2009-05-17 19:40:49 UTC (rev 6739)
@@ -665,6 +665,7 @@
 		self.last_selected_player = self.selected_player;
 }
 
+.float muted; // to be used by prvm_edictset server playernumber muted 1
 void Say(entity source, float teamsay, entity privatesay, string msgin, float floodcontrol)
 {
 	string msgstr, colorstr, cmsgstr, namestr, fullmsgstr, sourcemsgstr, fullcmsgstr, sourcecmsgstr, privatemsgprefix;
@@ -833,12 +834,23 @@
 	if(privatesay)
 		sourcemsgstr = strcat(privatemsgprefix, substring(sourcemsgstr, privatemsgprefixlen, -1));
 
-	if(flood == 1)
+	if(source.muted)
 	{
+		// always fake the message
+		sprint(source, sourcemsgstr);
+		if(cmsgstr != "" && !privatesay)
+			centerprint(source, sourcecmsgstr);
+	}
+	else if(flood == 1)
+	{
 		if(cvar("g_chat_flood_notify_flooder"))
 			sprint(source, strcat("^3FLOOD CONTROL: ^7wait ^1", ftos(source.flood_field - time), "^3 seconds\n"));
 		else
+		{
 			sprint(source, sourcemsgstr);
+			if(cmsgstr != "" && !privatesay)
+				centerprint(source, sourcecmsgstr);
+		}
 	}
 	else if(privatesay)
 	{