From: MirceaKitsune Date: Tue, 3 May 2011 19:36:16 +0000 (+0300) Subject: Some safety tweaks with the action delay X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=9760c1f5f73a265361ae226aac41259d6d861a58 Some safety tweaks with the action delay --- diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index 5b8d5ab3..154817c8 100644 --- 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) if(prey.classname == "player" && !prey.stat_eaten && prey.deadflag == DEAD_NO) // we can't swallow someone who's already in someone else's stomach if(self.classname == "player" && !self.stat_eaten && self.deadflag == DEAD_NO) // we can't swallow players while inside someone's stomach ourselves - if(!self.BUTTON_REGURGITATE && self.action_delay < time) + if(!self.BUTTON_REGURGITATE && time > self.action_delay) if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_speedcap")) { string swallow_complain; @@ -434,7 +434,7 @@ void Vore_AutoTaunt() void Vore_SetSbarRings() { - if(self.action_delay > time) + if(time <= self.action_delay) { self.stat_sbring1_type = 1; // ring shows vore action delay 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);