Fix the other bug too. We now have no more known bugs :)

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

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 292a37afee36c7c0e766f895fb9b6d6853a9b0e5..c369b3ef356f3a1633fa1509787dec14b94b8b11 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -517,6 +517,8 @@ float Client_customizeentityforclient()
        if(other.cvar_chase_active > 0 || other.classname == "observer") // the classname check prevents a bug\r
        {\r
                Client_setmodel(setmodel_state());\r
+               if not(self.eater.classname == "player")\r
+                       self.alpha = default_player_alpha;\r
                return TRUE;\r
        }\r
        if(other.spectatee_status)\r
@@ -525,9 +527,12 @@ float Client_customizeentityforclient()
        {\r
                tokenizebyseparator(self.playermodel, ".");\r
                Client_setmodel(strcat(argv(0), "_stomach.md3"));\r
+               self.alpha = other.cvar_cl_vore_stomachmodel;\r
                return TRUE;\r
        }\r
        Client_setmodel(setmodel_state());\r
+       if not(self.eater.classname == "player")\r
+               self.alpha = default_player_alpha;\r
        return TRUE;\r
 }\r
 \r
@@ -557,6 +562,8 @@ void PutObserverInServer (void)
                WriteEntity(MSG_ONE, self);\r
        }\r
 \r
+       Vore_Disconnect();\r
+\r
        kh_Key_DropAll(self, TRUE);\r
 \r
        if(self.flagcarried)\r
@@ -1619,7 +1626,6 @@ void UpdateChatBubble()
        }\r
 }\r
 \r
-\r
 void TeamBubbleThink()\r
 {\r
        self.nextthink = time;\r
@@ -1634,8 +1640,12 @@ void TeamBubbleThink()
        if (self.owner.BUTTON_CHAT || self.owner.deadflag || self.owner.killindicator || self.owner.eater.classname == "player")\r
                self.model = "";\r
        else\r
-               self.model = self.mdl;\r
-\r
+       {\r
+               if(cvar("g_balance_vore_teamheal") && self.owner.health < cvar("g_balance_vore_teamheal_stable"))\r
+                       setmodel(self, "models/misc/teambubbleheal.spr"); // indicate that this player can be teamhealed\r
+               else\r
+                       setmodel(self, "models/misc/teambubble.spr");\r
+       }\r
 };\r
 \r
 float TeamBubble_customizeentityforclient()\r
@@ -1659,8 +1669,8 @@ void UpdateTeamBubble()
 //             setorigin(self.teambubbleentity, self.origin + '0 0 15' + self.maxs_z * '0 0 1');\r
                setorigin(self.teambubbleentity, '0 0 15' + self.maxs_z * '0 0 1');\r
                setattachment(self.teambubbleentity, self, "");  // sticks to moving player better, also conserves bandwidth\r
-               self.teambubbleentity.mdl = self.teambubbleentity.model;\r
-               self.teambubbleentity.model = self.teambubbleentity.mdl;\r
+//             self.teambubbleentity.mdl = self.teambubbleentity.model;\r
+//             self.teambubbleentity.model = self.teambubbleentity.mdl;\r
                self.teambubbleentity.customizeentityforclient = TeamBubble_customizeentityforclient;\r
                self.teambubbleentity.effects = EF_LOWPRECISION;\r
        }\r
@@ -2011,6 +2021,7 @@ void SpectateCopy(entity spectatee) {
        self.stat_eaten = spectatee.stat_eaten;\r
        self.stat_stomachload = spectatee.stat_stomachload;\r
        self.stat_digesting = spectatee.stat_digesting;\r
+       self.stat_canleave = spectatee.stat_canleave;\r
        setorigin(self, spectatee.origin);\r
        setsize(self, spectatee.mins, spectatee.maxs);\r
        SetZoomState(spectatee.zoomstate);\r
@@ -2314,9 +2325,6 @@ void PlayerPreThink (void)
        // core code for the vore system\r
        Vore();\r
 \r
-       if(self.spectatee_status)\r
-               Vore_Disconnect();\r
-\r
        // version nagging\r
        if(self.version_nagtime)\r
                if(self.cvar_g_voretournamentversion)\r
@@ -2412,7 +2420,7 @@ void PlayerPreThink (void)
                        {\r
                                if(frametime)\r
                                        player_anim();\r
-                               button_pressed = (self.BUTTON_ATCK || self.BUTTON_JUMP || self.BUTTON_ATCK2 || self.BUTTON_GRABBER || self.BUTTON_USE);\r
+                               button_pressed = (self.BUTTON_ATCK || self.BUTTON_JUMP || self.BUTTON_ATCK2 || self.BUTTON_JETPACK || self.BUTTON_USE);\r
                                force_respawn = (g_lms || (g_ca) || cvar("g_forced_respawn"));\r
                                if (self.deadflag == DEAD_DYING)\r
                                {\r