]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
Move a check in the proper place
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 30 Sep 2010 00:57:12 +0000 (03:57 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 30 Sep 2010 00:57:12 +0000 (03:57 +0300)
data/qcsrc/server/vore.qc

index 30d2840314a70905ea4966aeb34e754f2aa13525..3c48f43913f2d002057d9bdb71da9939d8c47602 100644 (file)
@@ -30,6 +30,7 @@ float Swallow_condition_check(entity prey)
        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(!self.BUTTON_REGURGITATE && self.swallow_delay < time)\r
        if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_speedcap"))\r
        {\r
                if(teams_matter && prey.team == self.team && !cvar("g_vore_teamvore"))\r
@@ -384,7 +385,7 @@ void Vore()
        prey = Swallow_player_check();\r
 \r
        // attempt to swallow our new prey if we pressed the attack button, and there's any in range\r
-       if(self.BUTTON_ATCK && !self.BUTTON_REGURGITATE && self.swallow_delay < time)\r
+       if(self.BUTTON_ATCK)\r
        if(Swallow_condition_check(prey))\r
                Vore_Swallow(prey);\r
 \r