Some safety tweaks with the action delay

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 5b8d5ab39a78902786a27c0df7ef560eebedd48b..154817c831ed28b961979050e5ef1ca255b62aec 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -35,7 +35,7 @@ float Swallow_condition_check(entity prey)
        if(prey != self)\r
        if(prey.classname == "player" && !prey.stat_eaten && prey.deadflag == DEAD_NO) // we can't swallow someone who's already in someone else's stomach\r
        if(self.classname == "player" && !self.stat_eaten && self.deadflag == DEAD_NO) // we can't swallow players while inside someone's stomach ourselves\r
        if(prey != self)\r
        if(prey.classname == "player" && !prey.stat_eaten && prey.deadflag == DEAD_NO) // we can't swallow someone who's already in someone else's stomach\r
        if(self.classname == "player" && !self.stat_eaten && self.deadflag == DEAD_NO) // we can't swallow players while inside someone's stomach ourselves\r

-       if(!self.BUTTON_REGURGITATE && self.action_delay < time)\r
+       if(!self.BUTTON_REGURGITATE && time > self.action_delay)\r

        if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_speedcap"))\r
        {\r
                string swallow_complain;\r
        if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_speedcap"))\r
        {\r
                string swallow_complain;\r


@@ -434,7 +434,7 @@ void Vore_AutoTaunt()
 \r
 void Vore_SetSbarRings()\r
 {\r
 \r
 void Vore_SetSbarRings()\r
 {\r

-       if(self.action_delay > time)\r
+       if(time <= self.action_delay)\r

        {\r
                self.stat_sbring1_type = 1; // ring shows vore action delay\r
                self.stat_sbring1_clip = bound(0, (time / self.action_delay - 1) / ((self.action_delay - cvar("g_balance_vore_action_delay")) / self.action_delay - 1), 1);\r
        {\r
                self.stat_sbring1_type = 1; // ring shows vore action delay\r
                self.stat_sbring1_clip = bound(0, (time / self.action_delay - 1) / ((self.action_delay - cvar("g_balance_vore_action_delay")) / self.action_delay - 1), 1);\r