From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 1 Aug 2011 18:33:20 +0000 (+0300)
Subject: Some tweaks to the last feature
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=efb1607a797d10b1ce14c5e5deb48d55d203293e;p=voretournament%2Fvoretournament.git

Some tweaks to the last feature
---

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