From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 17 Apr 2011 21:56:14 +0000 (+0300)
Subject: Some fixes I forgot to self.deadflag in the vore code
X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=acc8ecaa3c5fa2577fc9baeac541295a54fa0dfb;ds=inline

Some fixes I forgot to self.deadflag in the vore code
---

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index c0966781..ac8d5b48 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -306,7 +306,7 @@ void Vore_DeadPrey_Detach(entity e)
 void Vore_PreyRelease(entity e, float pred_disconnect)
 {
 	// if the keepdeadprey feature is on, don't spit a dead prey's carcass out
-	if(e.health <= 0 && cvar("g_vore_keepdeadprey"))
+	if(e.deadflag != DEAD_NO && cvar("g_vore_keepdeadprey"))
 	{
 		// if keepdeadprey is enabled and the predator disconnected, detach the dead prey
 		if(pred_disconnect)
@@ -360,7 +360,7 @@ void Vore_Digest()
 		self.predator.digestion_step = time + steptime;
 	}
 
-	if(self.health <= 0)
+	if(self.deadflag != DEAD_NO)
 	if(stov(cvar_string("g_vore_regurgitatecolor_digest")))
 		self.colormod = stov(cvar_string("g_vore_regurgitatecolor_digest"));
 }
@@ -616,13 +616,13 @@ void Vore()
 	if(self.predator.classname != "player")
 		return;
 
-	if(self.deadflag)
+	if(self.deadflag != DEAD_NO)
 	{
 		Vore_PreyRelease(self, FALSE);
 		return;
 	}
 
-	if(self.predator.deadflag)
+	if(self.predator.deadflag != DEAD_NO)
 		Vore_Regurgitate(self);
 	else if(vlen(self.predator.velocity) > cvar("g_balance_vore_regurgitate_speedcap"))
 		Vore_Regurgitate(self);