From: MirceaKitsune Date: Thu, 9 Sep 2010 15:32:43 +0000 (+0300) Subject: Move this check here, makes more sense X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a9f13bd520968a9495b22baa78d0b883092d88c7;p=voretournament%2Fvoretournament.git Move this check here, makes more sense --- diff --git a/data/qcsrc/server/bot/havocbot/vore_ai.qc b/data/qcsrc/server/bot/havocbot/vore_ai.qc index 7536ccfa..7f6794eb 100644 --- a/data/qcsrc/server/bot/havocbot/vore_ai.qc +++ b/data/qcsrc/server/bot/havocbot/vore_ai.qc @@ -5,7 +5,7 @@ float Swallow_condition_check_bot(entity prey) // checks the necessary conditions for a bot to swallow another player if(Swallow_condition_check(prey)) // check the normal conditions imposed by the vore system - if(prey != self && !prey.BUTTON_CHAT) // don't eat players who are chatting + if not(prey.BUTTON_CHAT) // don't eat players who are chatting if(self.health > cvar("g_balance_vore_kick_damage_max")) // explained below return TRUE; return FALSE; diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index ea2e82b1..4de53814 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -27,6 +27,7 @@ float Swallow_condition_check(entity prey) { // checks the necessary conditions for swallowing another player + 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 not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_speedcap"))