r5453 - in trunk/data: . qcsrc/menu/nexuiz qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-08 08:02:10 -0500 (Thu, 08 Jan 2009)
New Revision: 5453

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c
   trunk/data/qcsrc/server/cl_player.qc
   trunk/data/qcsrc/server/defs.qh
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
cvar cl_taunt_directional


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-01-08 10:43:15 UTC (rev 5452)
+++ trunk/data/defaultNexuiz.cfg	2009-01-08 13:02:10 UTC (rev 5453)
@@ -124,6 +124,7 @@
 
 // taunts and voices
 seta cl_autotaunt 0.65
+seta cl_taunt_directional 1
 
 // server settings
 hostname "Nexuiz Server"

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c	2009-01-08 10:43:15 UTC (rev 5452)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c	2009-01-08 13:02:10 UTC (rev 5453)
@@ -131,11 +131,13 @@
 		me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(0, 1, sl, "Automatic taunts"));
 		if(sl.value != e.savedValue)
 			e.savedValue = 0.65; // default
-		me.TR(me);
+	me.TR(me);
 		me.TD(me, 1, 3, e = makeNexuizTextLabel(0.1, "Frequency:"));
 		me.TD(me, 1, 2, sl);
 	me.TR(me);
+		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_taunt_directional", "Play taunts directionally"));
 	me.TR(me);
+	me.TR(me);
 		me.TD(me, 1, 2.8, e = makeNexuizCheckBox(0, "cl_hitsound", "Hit indicator"));
 
 	me.gotoRC(me, me.rows - 1, 0);

Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2009-01-08 10:43:15 UTC (rev 5452)
+++ trunk/data/qcsrc/server/cl_player.qc	2009-01-08 13:02:10 UTC (rev 5453)
@@ -955,13 +955,22 @@
 		if (tauntrand < e.cvar_cl_autotaunt)
 		{
 			msg_entity = e;
-			soundto(MSG_ONE, self, chan, sample, VOL_BASE, ATTN_MIN);
+			if (e.cvar_cl_taunt_directional)
+				soundto(MSG_ONE, self, chan, sample, VOL_BASE, ATTN_MIN);
+			else
+				soundto(MSG_ONE, self, chan, sample, VOL_BASE, ATTN_NONE);
 		}
 	}
 	else if(teamsay == 5) // manual taunt
 	{
-		// broadcast the sound, but it's directional
-		sound(self, chan, sample, VOL_BASE, ATTN_MIN);
+		FOR_EACH_REALCLIENT(e)
+		{
+			msg_entity = e;
+			if (e.cvar_cl_taunt_directional)
+				soundto(MSG_ONE, self, chan, sample, VOL_BASE, ATTN_MIN);
+			else
+				soundto(MSG_ONE, self, chan, sample, VOL_BASE, ATTN_NONE);
+		}
 	}
 }
 

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2009-01-08 10:43:15 UTC (rev 5452)
+++ trunk/data/qcsrc/server/defs.qh	2009-01-08 13:02:10 UTC (rev 5453)
@@ -477,6 +477,7 @@
 
 // autotaunt system
 .float cvar_cl_autotaunt;
+.float cvar_cl_taunt_directional;
 
 .float version_mismatch;
 

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-01-08 10:43:15 UTC (rev 5452)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-01-08 13:02:10 UTC (rev 5453)
@@ -550,6 +550,7 @@
 	GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[8], "cl_weaponpriority8", W_FixWeaponOrder_AllowIncomplete);
 	GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[9], "cl_weaponpriority9", W_FixWeaponOrder_AllowIncomplete);
 	GetCvars_handleFloat(s, f, cvar_cl_autotaunt, "cl_autotaunt");
+	GetCvars_handleFloat(s, f, cvar_cl_taunt_directional, "cl_taunt_directional");
 	GetCvars_handleFloat(s, f, cvar_cl_hitsound, "cl_hitsound");
 
 	// fixup of switchweapon (needed for LMS or when spectating is disabled, as PutClientInServer comes too early)