Empty predator / prey swallow progress upon respawn

[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 94f5936c99f66a1725cb1aa3769629630b232322..1ccdea5c979a0f7f2168529e268f87062dd8851e 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -840,6 +840,7 @@ void PutClientInServer (void)
 \r
                Vore_DeadPrey_Detach(self);\r
                self.fakeprey = FALSE; // clear the fakeprey status\r
+               self.swallow_progress_pred = self.swallow_progress_prey = 0;\r
 \r
                self.classname = "player";\r
                self.wasplayer = TRUE;\r
@@ -1038,13 +1039,15 @@ float ClientInit_SendEntity(entity to, float sf)
                WriteString(MSG_ENTITY, world.fog);\r
        else\r
                WriteString(MSG_ENTITY, "");\r
-       WriteCoord(MSG_ENTITY, cvar("g_campaign"));\r
+       WriteShort(MSG_ENTITY, cvar("g_campaign"));\r
        WriteByte(MSG_ENTITY, cvar("g_balance_armor_blockpercent") * 255.0);\r
        WriteByte(MSG_ENTITY, cvar("g_balance_weaponswitchdelay") * 255.0);\r
 \r
-       WriteCoord(MSG_ENTITY, cvar("g_vore"));\r
-       WriteCoord(MSG_ENTITY, g_balance_vore_swallow_limit);\r
-       WriteCoord(MSG_ENTITY, cvar("g_healthsize"));\r
+       WriteShort(MSG_ENTITY, cvar("g_vore"));\r
+       WriteShort(MSG_ENTITY, g_balance_vore_swallow_limit);\r
+       WriteShort(MSG_ENTITY, cvar("g_healthsize"));\r
+       WriteShort(MSG_ENTITY, cvar("g_healthsize_min"));\r
+       WriteShort(MSG_ENTITY, cvar("g_healthsize_max"));\r
 \r
        // tell the client if this server uses armor\r
        float armor_max;\r
@@ -1052,6 +1055,11 @@ float ClientInit_SendEntity(entity to, float sf)
                armor_max = cvar("g_balance_armor_limit");\r
        WriteCoord(MSG_ENTITY, armor_max);\r
 \r
+       float teamheal_max;\r
+       if(cvar("g_vore") && cvar("g_vore_teamvore") && cvar("g_balance_vore_teamheal"))\r
+               teamheal_max = cvar("g_balance_vore_teamheal_stable");\r
+       WriteCoord(MSG_ENTITY, teamheal_max);\r
+\r
        return TRUE;\r
 }\r
 \r
@@ -1453,8 +1461,7 @@ void ClientConnect (void)
                ctf_clientconnect();\r
        }*/\r
 \r
-       if(teams_matter || radar_showennemies)\r
-               attach_entcs();\r
+       attach_entcs();\r
 \r
        bot_relinkplayerlist();\r
 \r
@@ -1535,7 +1542,6 @@ Called when a client disconnects from the server
 =============\r
 */\r
 .entity chatbubbleentity;\r
-.entity teambubbleentity;\r
 void ReadyCount();\r
 void ClientDisconnect (void)\r
 {\r
@@ -1583,9 +1589,6 @@ void ClientDisconnect (void)
        if (self.chatbubbleentity)\r
                remove (self.chatbubbleentity);\r
 \r
-       if (self.teambubbleentity)\r
-               remove (self.teambubbleentity);\r
-\r
        if (self.killindicator)\r
                remove (self.killindicator);\r
 \r
@@ -1662,57 +1665,6 @@ void UpdateChatBubble()
        }\r
 }\r
 \r
-void TeamBubbleThink()\r
-{\r
-       self.nextthink = time;\r
-       if (!self.owner.modelindex || self.owner.teambubbleentity != self)\r
-       {\r
-               if(self.owner) // but why can that ever be world?\r
-                       self.owner.teambubbleentity = world;\r
-               remove(self);\r
-               return;\r
-       }\r
-//     setorigin(self, self.owner.origin + '0 0 15' + self.owner.maxs_z * '0 0 1');  // bandwidth hog. setattachment does this now\r
-       if (self.owner.BUTTON_CHAT || self.owner.deadflag || self.owner.killindicator || self.owner.stat_eaten)\r
-               self.model = "";\r
-       else\r
-       {\r
-               if(cvar("g_balance_vore_teamheal") && cvar("g_vore_teamvore"))\r
-               if(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
-{\r
-       return (self.owner != other && self.owner.team == other.team && other.killcount > -666);\r
-}\r
-\r
-void UpdateTeamBubble()\r
-{\r
-       if (!self.modelindex || !teams_matter)\r
-               return;\r
-       // spawn a teambubble entity if needed\r
-       if (!self.teambubbleentity && teams_matter)\r
-       {\r
-               self.teambubbleentity = spawn();\r
-               self.teambubbleentity.owner = self;\r
-               self.teambubbleentity.exteriormodeltoclient = self;\r
-               self.teambubbleentity.think = TeamBubbleThink;\r
-               self.teambubbleentity.nextthink = time;\r
-               setmodel(self.teambubbleentity, "models/misc/teambubble.spr"); // precision set below\r
-//             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.customizeentityforclient = TeamBubble_customizeentityforclient;\r
-               self.teambubbleentity.effects = EF_LOWPRECISION;\r
-       }\r
-}\r
-\r
 // LordHavoc: this hack will be removed when proper _pants/_shirt layers are\r
 // added to the model skins\r
 /*void UpdateColorModHack()\r
@@ -2876,7 +2828,6 @@ void PlayerPostThink (void)
        if(self.classname == "player") {\r
                CheckRules_Player();\r
                UpdateChatBubble();\r
-               UpdateTeamBubble();\r
                if (self.impulse)\r
                        ImpulseCommands();\r
                if (intermission_running)\r