From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 4 Oct 2010 22:40:02 +0000 (+0300)
Subject: Properly implement that last change. 0.4 has been delayed, so this is a pre-0.4 change.
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=75d23e5f9607babc79907e89c9d9783dc825082a;p=voretournament%2Fvoretournament.git

Properly implement that last change. 0.4 has been delayed, so this is a pre-0.4 change.
---

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 61330cd4..bfd7daa3 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -253,9 +253,6 @@ void Vore_Digest()
 {
 	// apply digestion to prey
 
-	if(!cvar("g_vore_digestion"))
-		return;
-
 	if(time > self.predator.digestion_step)
 	{
 		Damage(self, self.predator, self.predator, cvar("g_balance_vore_digestion_damage"), DEATH_DIGESTION, self.origin, '0 0 0');
@@ -293,9 +290,6 @@ void Vore_StomachKick()
 {
 	// allows prey to kick the predator's stomach and do some damage or attempt to escape
 
-	if(!cvar("g_vore_kick"))
-		return;
-
 	if(time > self.stomachkick_delay)
 	{
 		float damage;
@@ -397,7 +391,7 @@ void Vore()
 		Vore_Swallow(prey);
 
 	// toggle digestion, if the player has someone in their stomach
-	if(self.BUTTON_DIGEST)
+	if(self.BUTTON_DIGEST && cvar("g_vore_digestion"))
 	{
 		if(self.stomach_load)
 		{
@@ -468,7 +462,7 @@ void Vore()
 		Vore_Teamheal();
 
 	// execute prey commands
-	if(self.BUTTON_ATCK)
+	if(self.BUTTON_ATCK && cvar("g_vore_kick"))
 		Vore_StomachKick();
 	if(self.BUTTON_JUMP)
 		Vore_StomachLeave();