Allow prey to stay inside dead predators (long as they haven't been gibbed). Dead...

[voretournament/voretournament.git] / data / qcsrc / server / vore.qc

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index e053463942403b37b712b920bb8e2275401ffd55..097792c056b7a509679df27b791b1f8a151807df 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -441,7 +441,9 @@ void Vore_Digest()
 {\r
        // apply digestion to prey\r
 \r
-       if(self.health <= cvar("g_balance_vore_digestion_limit"))\r
+       if(self.predator.deadflag != DEAD_NO) // dead predators don't digest\r
+               return;\r
+       if(self.health <= cvar("g_balance_vore_digestion_limit")) // don't digest below this amount of health\r
                return;\r
 \r
        if(time > self.digestion_step)\r
@@ -838,11 +840,14 @@ void Vore()
                return;\r
        }\r
 \r
-       if(self.predator.deadflag != DEAD_NO) // do we want to be in a dead furry x_x\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
        }\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
        {\r
                Vore_Regurgitate(self);\r