From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 27 Feb 2011 22:52:05 +0000 (+0200)
Subject: Set the proper voice types in code
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=645c441d589f9672bffb8fef9cc34a5c747cc9a8

Set the proper voice types in code
---

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index b8822608..448fb8d3 100644
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -2639,8 +2639,11 @@ void PlayerPreThink (void)
 			case TAUNTTYPE_DEATH:
 				PlayerSound(self, playersound_taunt, CHAN_VOICE, VOICETYPE_AUTOTAUNT);
 				break;
-			case TAUNTTYPE_VORE:
-				PlayerSound(self, playersound_taunt, CHAN_VOICE, VOICETYPE_AUTOTAUNT); // change this properly
+			case TAUNTTYPE_VOREPRED:
+				PlayerSound(self, playersound_pred, CHAN_VOICE, VOICETYPE_AUTOTAUNT); // change this properly
+				break;
+			case TAUNTTYPE_VOREPREY:
+				PlayerSound(self, playersound_prey, CHAN_VOICE, VOICETYPE_AUTOTAUNT); // change this properly
 				break;
 			default:
 				dprint("Incorrect autotaunt type\n");
diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 9c80b052..a2636062 100644
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -464,6 +464,8 @@ float next_pingtime;
 		_VOICEMSG(meet) \
 		_VOICEMSG(seenflag) \
 		_VOICEMSG(taunt) \
+		_VOICEMSG(pred) \
+		_VOICEMSG(prey) \
 		_VOICEMSG(teamshoot)
 
 #define _VOICEMSG(m) .string playersound_##m;
@@ -504,7 +506,8 @@ string globalsound_metalstep;
 #define VOICETYPE_GURGLE 16
 
 #define TAUNTTYPE_DEATH 1
-#define TAUNTTYPE_VORE 2
+#define TAUNTTYPE_VOREPRED 2
+#define TAUNTTYPE_VOREPREY 3
 
 void PrecachePlayerSounds(string f);
 void PrecacheGlobalSound(string samplestring);