From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 30 Sep 2010 00:57:12 +0000 (+0300)
Subject: Move a check in the proper place
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=46bc3e1ddc14abc09d929b66ad54966a36ee1e4b;p=voretournament%2Fvoretournament.git

Move a check in the proper place
---

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 30d28403..3c48f439 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -30,6 +30,7 @@ float Swallow_condition_check(entity prey)
 	if(prey != self)
 	if(prey.classname == "player" && prey.predator.classname != "player" && prey.deadflag == DEAD_NO) // we can't swallow someone who's already in someone else's stomach
 	if(self.classname == "player" && self.predator.classname != "player" && self.deadflag == DEAD_NO) // we can't swallow players while inside someone's stomach ourselves
+	if(!self.BUTTON_REGURGITATE && self.swallow_delay < time)
 	if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_speedcap"))
 	{
 		if(teams_matter && prey.team == self.team && !cvar("g_vore_teamvore"))
@@ -384,7 +385,7 @@ void Vore()
 	prey = Swallow_player_check();
 
 	// attempt to swallow our new prey if we pressed the attack button, and there's any in range
-	if(self.BUTTON_ATCK && !self.BUTTON_REGURGITATE && self.swallow_delay < time)
+	if(self.BUTTON_ATCK)
 	if(Swallow_condition_check(prey))
 		Vore_Swallow(prey);