r5449 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-08 04:00:07 -0500 (Thu, 08 Jan 2009)
New Revision: 5449

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/cl_player.qc
   trunk/data/qcsrc/server/g_damage.qc
Log:
delay taunts by 1 second


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-01-08 08:46:16 UTC (rev 5448)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-01-08 09:00:07 UTC (rev 5449)
@@ -2299,12 +2299,19 @@
 		oldself = self; self = self.teamkill_soundsource;
 		oldpusher = self.pusher; self.pusher = oldself;
 
-		VoiceMessage("teamshoot_auto");
+		PlayerSound(playersound_teamshoot, CHAN_VOICE, 3);
 
 		self.pusher = oldpusher;
 		self = oldself;
 	}
 
+	if(self.taunt_soundtime)
+	if(time > self.taunt_soundtime)
+	{
+		self.taunt_soundtime = 0;
+		PlayerSound(playersound_taunt, CHAN_VOICE, 4);
+	}
+
 	target_voicescript_next(self);
 }
 

Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2009-01-08 08:46:16 UTC (rev 5448)
+++ trunk/data/qcsrc/server/cl_player.qc	2009-01-08 09:00:07 UTC (rev 5449)
@@ -765,8 +765,6 @@
 		return 0;
 	if(type == "teamshoot")
 		return 2;
-	if(type == "teamshoot_auto")
-		return 3;
 	return 1;
 }
 
@@ -782,8 +780,6 @@
 #define _VOICEMSG(m) case #m: return playersound_##m;
 		ALLVOICEMSGS
 #undef _VOICEMSG
-		// exception:
-		case "teamshoot_auto": return playersound_teamshoot;
 	}
 	GetPlayerSoundSampleField_notFound = 1;
 	return playersound_taunt;

Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2009-01-08 08:46:16 UTC (rev 5448)
+++ trunk/data/qcsrc/server/g_damage.qc	2009-01-08 09:00:07 UTC (rev 5449)
@@ -11,6 +11,7 @@
 .float teamkill_soundtime;
 .entity teamkill_soundsource;
 .entity pusher;
+.float taunt_soundtime;
 
 
 float IsDifferentTeam(entity a, entity b)
@@ -296,10 +297,7 @@
 				} 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;
+					attacker.taunt_soundtime = time + 1;
 				}
 
 				if(sv_gentle) {