]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
Properly implement that last change. 0.4 has been delayed, so this is a pre-0.4 change.
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 4 Oct 2010 22:40:02 +0000 (01:40 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 4 Oct 2010 22:40:02 +0000 (01:40 +0300)
data/qcsrc/server/vore.qc

index 61330cd49e2d8c844407c83ef4a8e0c53d7afa05..bfd7daa3b3f65973509246c2d422176fd0a381de 100644 (file)
@@ -253,9 +253,6 @@ void Vore_Digest()
 {\r
        // apply digestion to prey\r
 \r
-       if(!cvar("g_vore_digestion"))\r
-               return;\r
-\r
        if(time > self.predator.digestion_step)\r
        {\r
                Damage(self, self.predator, self.predator, cvar("g_balance_vore_digestion_damage"), DEATH_DIGESTION, self.origin, '0 0 0');\r
@@ -293,9 +290,6 @@ void Vore_StomachKick()
 {\r
        // allows prey to kick the predator's stomach and do some damage or attempt to escape\r
 \r
-       if(!cvar("g_vore_kick"))\r
-               return;\r
-\r
        if(time > self.stomachkick_delay)\r
        {\r
                float damage;\r
@@ -397,7 +391,7 @@ void Vore()
                Vore_Swallow(prey);\r
 \r
        // toggle digestion, if the player has someone in their stomach\r
-       if(self.BUTTON_DIGEST)\r
+       if(self.BUTTON_DIGEST && cvar("g_vore_digestion"))\r
        {\r
                if(self.stomach_load)\r
                {\r
@@ -468,7 +462,7 @@ void Vore()
                Vore_Teamheal();\r
 \r
        // execute prey commands\r
-       if(self.BUTTON_ATCK)\r
+       if(self.BUTTON_ATCK && cvar("g_vore_kick"))\r
                Vore_StomachKick();\r
        if(self.BUTTON_JUMP)\r
                Vore_StomachLeave();\r