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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-06 10:06:44 -0500 (Tue, 06 Jan 2009)
New Revision: 5426

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/g_damage.qc
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
autotaunts by MirceaKitsune (using cl_autotaunt cvar)


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-01-06 13:59:45 UTC (rev 5425)
+++ trunk/data/defaultNexuiz.cfg	2009-01-06 15:06:44 UTC (rev 5426)
@@ -122,6 +122,9 @@
 
 cl_autodemo_nameformat demos/%Y-%m-%d_%H-%M
 
+// taunts and voices
+seta cl_autotaunt 0.65
+
 // server settings
 hostname "Nexuiz Server"
 set sv_mapchange_delay 5

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c	2009-01-06 13:59:45 UTC (rev 5425)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c	2009-01-06 15:06:44 UTC (rev 5426)
@@ -20,7 +20,7 @@
 
 void fillNexuizAudioSettingsTab(entity me)
 {
-	entity e, s;
+	entity e, s, sl;
 
 	me.TR(me);
 		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "bgmvolume");
@@ -121,7 +121,11 @@
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 2.8, e = makeNexuizCheckBox(0, "snd_swapstereo", "Swap Stereo"));
 	me.TR(me);
-	
+	me.TR(me);
+		sl = makeNexuizSlider(0.15, 1, 0.05, "cl_autotaunt");
+		me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(0, 1, sl, "Auto taunting:"));
+		me.TD(me, 1, 2, sl);
+	me.TR(me);
 
 	me.gotoRC(me, me.rows - 1, 0);
 		me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "snd_restart", COMMANDBUTTON_APPLY));

Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2009-01-06 13:59:45 UTC (rev 5425)
+++ trunk/data/qcsrc/server/cl_player.qc	2009-01-06 15:06:44 UTC (rev 5426)
@@ -951,6 +951,15 @@
 			sound(self, chan, sample, VOL_BASE, ATTN_NONE);
 		}
 	}
+	else if(teamsay == 4) // auto taunt
+	{
+		float tauntrand = random();
+		FOR_EACH_REALCLIENT(e)
+		if (tauntrand < e.cvar_cl_autotaunt)
+		{
+			soundto(MSG_ONE, self, chan, sample, VOL_BASE, ATTN_NONE);
+		}
+	}
 }
 
 void PlayerSound(.string samplefield, float chan, float teamsay)

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2009-01-06 13:59:45 UTC (rev 5425)
+++ trunk/data/qcsrc/server/defs.qh	2009-01-06 15:06:44 UTC (rev 5426)
@@ -473,6 +473,9 @@
 void GlobalSound(string samplestring, float channel, float teamsay); // 0 is normal, 1 is team, 2 is last attacker
 void VoiceMessage(string type);
 
+// autotaunt system
+.float cvar_cl_autotaunt;
+
 .float version_mismatch;
 
 float independent_players;

Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2009-01-06 13:59:45 UTC (rev 5425)
+++ trunk/data/qcsrc/server/g_damage.qc	2009-01-06 15:06:44 UTC (rev 5426)
@@ -296,6 +296,10 @@
 				} else {
 					centerprint(attacker, strcat("^4You fragged ^7", s, "\n\n\n"));
 					centerprint(targ, strcat("^1You were fragged by ^7", a, "\n\n\n"));
+					entity oldself = self; // Hackish way to fix taunts, otherwise they play the other way around
+					self = attacker;
+					PlayerSound(playersound_taunt, CHAN_VOICE, 4);
+					self = oldself;
 				}
 
 				if(sv_gentle) {

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-01-06 13:59:45 UTC (rev 5425)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-01-06 15:06:44 UTC (rev 5426)
@@ -549,6 +549,7 @@
 	GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[7], "cl_weaponpriority7", W_FixWeaponOrder_AllowIncomplete);
 	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");
 
 	// fixup of switchweapon (needed for LMS or when spectating is disabled, as PutClientInServer comes too early)
 	if(f > 0)