[nexuiz-commits] r7551 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-08-29 09:00:40 -0400 (Sat, 29 Aug 2009)
New Revision: 7551

Modified:
   trunk/data/qcsrc/server/cl_player.qc
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
new cvars sv_taunt, sv_autotaunt


Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2009-08-28 19:55:22 UTC (rev 7550)
+++ trunk/data/qcsrc/server/cl_player.qc	2009-08-29 13:00:40 UTC (rev 7551)
@@ -803,6 +803,10 @@
 	if(intermission_running)
 		teamsay = FALSE;
 
+	msgin = trigger_magicear_processmessage_forallears(source, teamsay, privatesay, msgin);
+	if(msgin == "")
+		return;
+
 	/*
 	 * using bprint solves this... me stupid
 	// how can we prevent the message from appearing in a listen server?
@@ -1187,6 +1191,12 @@
 				}
 			break;
 		case VOICETYPE_AUTOTAUNT:
+			if(!sv_autotaunt)
+				break;
+			if(!sv_taunt)
+				break;
+			if(sv_gentle)
+				break;
 			tauntrand = random();
 			FOR_EACH_REALCLIENT(msg_entity)
 				if (tauntrand < msg_entity.cvar_cl_autotaunt)
@@ -1201,6 +1211,10 @@
 			if(self.classname == "player")
 				if(self.deadflag == DEAD_NO)
 					setanim(self, self.anim_taunt, FALSE, TRUE, TRUE);
+			if(!sv_taunt)
+				break;
+			if(sv_gentle)
+				break;
 			FOR_EACH_REALCLIENT(msg_entity)
 			{
 				if (msg_entity.cvar_cl_voice_directional >= 1)

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-08-28 19:55:22 UTC (rev 7550)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-08-29 13:00:40 UTC (rev 7551)
@@ -1026,6 +1026,9 @@
 float g_touchexplode_edgedamage;
 float g_touchexplode_force;
 
+float sv_autotaunt;
+float sv_taunt;
+
 void readlevelcvars(void)
 {
     g_bugrigs = cvar("g_bugrigs");
@@ -1079,6 +1082,8 @@
     sv_pogostick = cvar("sv_pogostick");
     sv_doublejump = cvar("sv_doublejump");
     g_ctf_reverse = cvar("g_ctf_reverse");
+	sv_autotaunt = cvar("sv_autotaunt");
+	sv_taunt = cvar("sv_taunt");
 
     inWarmupStage = cvar("g_warmup");
     g_warmup_limit = cvar("g_warmup_limit");