Some tweaks to the last feature

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 097792c056b7a509679df27b791b1f8a151807df..bae2c92cfeeb7b694e33414d767b72c9f04fe93c 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -442,7 +442,10 @@ void Vore_Digest()
        // apply digestion to prey\r
 \r
        if(self.predator.deadflag != DEAD_NO) // dead predators don't digest\r
+       {\r
+               self.predator.digesting = FALSE;\r
                return;\r
+       }\r
        if(self.health <= cvar("g_balance_vore_digestion_limit")) // don't digest below this amount of health\r
                return;\r
 \r
@@ -842,10 +845,14 @@ void Vore()
 \r
        // do we stick around inside dead furries? x_x\r
        if(self.predator.deadflag != DEAD_NO)\r
-       if(!cvar("g_balance_vore_deadpredator") || !self.predator.modelindex) // if the predator is gibbed, we are out\r
        {\r
-               Vore_Regurgitate(self);\r
-               return;\r
+               if(!cvar("g_balance_vore_deadpredator") || !self.predator.modelindex) // if the predator is gibbed, we are out\r
+               {\r
+                       Vore_Regurgitate(self);\r
+                       return;\r
+               }\r
+               if(self.predator.regurgitate_prepare) // abort scheduled regurgitation\r
+                       self.predator.regurgitate_prepare = 0;\r
        }\r
 \r
        if(self.predator.stomach_load > self.predator.stomach_maxload) // the predator got beyond his capacity after eating, so some prey must pop out\r