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 7536ccfab51b7079cec4968b2a29f018cb75ae8d..7f6794eb6e23b233ed9ccf8228f3eb81e96d75ac 100644 (file)
--- 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 ea2e82b13330ef3f7bbcb8f11253c6783946dc6b..4de538145f961220512e8da9be8a173e6c1c8380 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -27,6 +27,7 @@ float Swallow_condition_check(entity prey)
 {\r
        // checks the necessary conditions for swallowing another player\r
 \r
+       if(prey != self)\r
        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\r
        if(self.classname == "player" && self.predator.classname != "player" && self.deadflag == DEAD_NO) // we can't swallow players while inside someone's stomach ourselves\r
        if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_speedcap"))\r