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 987938627b4abd3a5a006f589a068e43078f1717..c369b3ef356f3a1633fa1509787dec14b94b8b11 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -562,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
@@ -1624,7 +1626,6 @@ void UpdateChatBubble()
        }\r
 }\r
 \r
-\r
 void TeamBubbleThink()\r
 {\r
        self.nextthink = time;\r
@@ -1639,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
@@ -1664,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
@@ -2320,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