Fix comments and move check

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

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 9dfb21fe6afef659e4459abbdb129f03b348e8a8..8d59e2bbd8091e29ef0944a184db052fe4972a42 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -111,9 +111,6 @@ void Vore_Swallow(entity e)
        e.alpha = -1; // best way of hiding / showing the eaten player\r
        e.aiment = e.eater; // follow the predator. Is automatically unset\r
 \r
-       /*e.cameraeffect_current = e.view_ofs_z * 2;\r
-       e.cameraeffect_target = e.view_ofs_z / 2; // best positioning for the stomach model*/\r
-\r
        Vore_CameraEffect_Set(e);\r
 \r
        // drop keys (KH) and flags (CTF) when we get swallowed\r
@@ -142,8 +139,6 @@ void Vore_Regurgitate(entity e)
        e.view_ofs_z = e.vore_oldview_ofs_z;\r
        e.alpha = default_player_alpha; // best way of hiding / showing the eaten player\r
 \r
-       //e.view_ofs_z *= 2; // best positioning for the stomach model\r
-\r
        // velocities\r
        local vector oldforward, oldright, oldup;\r
        oldforward = v_forward;\r
@@ -176,7 +171,7 @@ void Vore_Disconnect()
        // prey disconnects or goes spectating while inside someone's belly:\r
        if(self.eater.classname == "player")\r
        {\r
-               self.view_ofs_z += 25;\r
+               self.view_ofs_z = self.vore_oldview_ofs_z;\r
                self.eater.stomach_load -= 1;\r
                Vore_Weight_apply(self.eater);\r
                self.eater = world;\r
@@ -232,12 +227,10 @@ void Vore_Teamheal()
 .float stomachkick_delay;\r
 void Vore_StomachKick()\r
 {\r
-       // allows prey to kick the predator's stomach and do some damage / attempt to escape, or bring the predator's digestion upon their self when there's no other option\r
+       // allows prey to kick the predator's stomach and do some damage / attempt to escape\r
        if(self.eater.classname != "player")\r
                return;\r
 \r
-       // kick the predator's stomach and do damage, or escape if we are lucky\r
-       if(self.BUTTON_ATCK)\r
        if(time > self.stomachkick_delay)\r
        {\r
                float damage;\r
@@ -250,13 +243,6 @@ void Vore_StomachKick()
 \r
                self.stomachkick_delay = time + cvar("g_balance_vore_kick_delay");\r
        }\r
-\r
-       // start the predator's digestion\r
-       if(self.BUTTON_ATCK2)\r
-       {\r
-               centerprint(self.eater, strcat(self.netname, " has triggered your digestion"));\r
-               self.eater.digesting = TRUE;\r
-       }\r
 }\r
 \r
 .float gurglesound_finished, gurglesound_oldstomachload;\r
@@ -391,7 +377,8 @@ void Vore()
        if(teams_matter && self.team == self.eater.team)\r
                Vore_Teamheal();\r
 \r
-       Vore_StomachKick();\r
+       if(self.BUTTON_ATCK)\r
+               Vore_StomachKick();\r
 \r
        Vore_CameraEffect_Apply();\r
 }
\ No newline at end of file