Set the proper voice types in code

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index b882260800b8afbb094f8eed12c58d27fb79c2fe..448fb8d33c525e38fecdeacf8a669eb280daa03d 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -2639,8 +2639,11 @@ void PlayerPreThink (void)
                        case TAUNTTYPE_DEATH:\r
                                PlayerSound(self, playersound_taunt, CHAN_VOICE, VOICETYPE_AUTOTAUNT);\r
                                break;\r
-                       case TAUNTTYPE_VORE:\r
-                               PlayerSound(self, playersound_taunt, CHAN_VOICE, VOICETYPE_AUTOTAUNT); // change this properly\r
+                       case TAUNTTYPE_VOREPRED:\r
+                               PlayerSound(self, playersound_pred, CHAN_VOICE, VOICETYPE_AUTOTAUNT); // change this properly\r
+                               break;\r
+                       case TAUNTTYPE_VOREPREY:\r
+                               PlayerSound(self, playersound_prey, CHAN_VOICE, VOICETYPE_AUTOTAUNT); // change this properly\r
                                break;\r
                        default:\r
                                dprint("Incorrect autotaunt type\n");\r

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 9c80b05264e162994a21eafe1692db5974df7e66..a2636062f4c1f1cacbbafe0e8455d08470780758 100644 (file)
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -464,6 +464,8 @@ float next_pingtime;
                _VOICEMSG(meet) \\r
                _VOICEMSG(seenflag) \\r
                _VOICEMSG(taunt) \\r
+               _VOICEMSG(pred) \\r
+               _VOICEMSG(prey) \\r
                _VOICEMSG(teamshoot)\r
 \r
 #define _VOICEMSG(m) .string playersound_##m;\r
@@ -504,7 +506,8 @@ string globalsound_metalstep;
 #define VOICETYPE_GURGLE 16\r
 \r
 #define TAUNTTYPE_DEATH 1\r
-#define TAUNTTYPE_VORE 2\r
+#define TAUNTTYPE_VOREPRED 2\r
+#define TAUNTTYPE_VOREPREY 3\r
 \r
 void PrecachePlayerSounds(string f);\r
 void PrecacheGlobalSound(string samplestring);\r