Taunts for prey. Still need fixing

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 30dcec81c016b58f58073a376c16800b4b3ead21..a637c15080d6f6025ed4ad11bc15798ed6de7d36 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -417,15 +417,24 @@ void Vore_AutoTaunt()
        // predator taunts\r
        if(self.stomach_load && !Stomach_TeamMates_check(self))\r
        {\r
-               // taunt_soundtime is set to 0 after the taunt has played, so this indicates a new start\r
                if(!self.taunt_soundtime)\r
-               {\r
                        SetAutoTaunt(self, time, TRUE, TAUNTTYPE_VOREPRED);\r
-               }\r
        }\r
        else if(self.taunt_soundtype == TAUNTTYPE_VOREPRED)\r
        {\r
-               // we have a predator taunt scheduled, but we're no longer a predator, so remove it\r
+               // we have a predator taunt scheduled, but are no longer a (suitable) predator, so remove it\r
+               SetAutoTaunt(self, 0, FALSE, 0);\r
+       }\r
+\r
+       // prey taunts\r
+       if(self.predator.classname == "player" && !(teams_matter && self.team == self.predator.team))\r
+       {\r
+               if(!self.taunt_soundtime)\r
+                       SetAutoTaunt(self, time, TRUE, TAUNTTYPE_VOREPREY);\r
+       }\r
+       else if(self.taunt_soundtype == TAUNTTYPE_VOREPREY)\r
+       {\r
+               // we have a prey taunt scheduled, but are no longer a (suitable) prey, so remove it\r
                SetAutoTaunt(self, 0, FALSE, 0);\r
        }\r
 }\r