Play beep sound when a team mate was healed to the maximum amount, to both the prey...

[voretournament/voretournament.git] / data / qcsrc / server / vore.qc

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index d675f5d5bf8b866c7beb21f9b54d597a44693566..2c83a711ef7ef71df258eb91646832cde296d55d 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -201,8 +201,10 @@ void Vore_Swallow(entity e)
 \r
        if(teams_matter && e.team == e.predator.team)\r
        {\r
-               centerprint(e, "^3You have been swallowed by a team mate, don't kick!");\r
-               centerprint(e.predator, "^3You have swallowed a team mate, use caution!");\r
+               if(cvar("g_vore_kick"))\r
+                       centerprint(e, "^3You have been swallowed by a team mate, don't kick!");\r
+               if(cvar("g_vore_digestion"))\r
+                       centerprint(e.predator, "^3You have swallowed a team mate, don't digest!");\r
        }\r
 \r
        PlayerSound(e.predator, playersound_swallow, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
@@ -374,6 +376,13 @@ void Vore_Teamheal()
        {\r
                self.health += cvar("g_balance_vore_teamheal");\r
                self.teamheal_step = time + steptime;\r
+\r
+               // play beep sound when a team mate was healed to the maximum amount, to both the prey and the predator\r
+               if(self.health >= cvar("g_balance_vore_teamheal_stable"))\r
+               {\r
+                       play2(self, "misc/beep.ogg");\r
+                       play2(self.predator, "misc/beep.ogg");\r
+               }\r
        }\r
 }\r
 \r
@@ -547,6 +556,8 @@ void Vore()
                if(self.BUTTON_ATCK)\r
                        Vore_Swallow(prey);\r
        }\r
+       else if(prey != world)\r
+               self.stat_canswallow = -1;\r
 \r
        // toggle digestion, if the player has someone in their stomach\r
        if(self.BUTTON_DIGEST && cvar("g_vore_digestion"))\r