Only show the health and armor of team mates, not enemies. Sadly, the health of all...

[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 3062930029604e786ba4ae094ad7f8a211c3b141..39b891f21c988093330bee13a71a107d898d4d76 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -436,9 +436,9 @@ string setmodel_state()
        newmodel_extension = substring(self.playermodel, strlen(self.playermodel) - 4, 4);\r
 \r
        float vore_state;\r
-       if(self.stomach_load > ceil(g_balance_vore_swallow_limit * 0.666666666666))\r
+       if(self.stomach_load > ceil(g_balance_vore_swallow_limit * 0.6))\r
                vore_state = 3;\r
-       else if(self.stomach_load > ceil(g_balance_vore_swallow_limit * 0.333333333333))\r
+       else if(self.stomach_load > ceil(g_balance_vore_swallow_limit * 0.3))\r
                vore_state = 2;\r
        else if(self.stomach_load)\r
                vore_state = 1;\r
@@ -523,7 +523,7 @@ float Client_customizeentityforclient()
        // this is only visible to the prey however, otherwise players would appear as a floating stomach to everyone (ewww)\r
        stomachmodel = strcat(substring(self.playermodel, 0, strlen(self.playermodel) - 4), "_stomach.md3"); // 4 is the extension length\r
 \r
-       if(other.spectatee_status)\r
+       if(other.spectatee_status && other.spectatee_status == num_for_edict(other.enemy))\r
                other = other.enemy; // also do this for the player we are spectating\r
 \r
        // don't do this if we have chase_active enabled, as we'd be seeing a floating stomach from third person view\r
@@ -1044,6 +1044,19 @@ float ClientInit_SendEntity(entity to, float sf)
 \r
        WriteCoord(MSG_ENTITY, cvar("g_vore"));\r
        WriteCoord(MSG_ENTITY, g_balance_vore_swallow_limit);\r
+       WriteCoord(MSG_ENTITY, cvar("g_healthsize"));\r
+\r
+       // tell the client if this server uses armor\r
+       float armor_max;\r
+       if(cvar("g_balance_armor_start") || (cvar("g_lms") && cvar("g_lms_start_armor")) /*|| (inWarmupStage && cvar("g_warmup_start_armor"))*/ || cvar("g_balance_armor_regen") || cvar("g_balance_armor_regenlinear"))\r
+               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
@@ -1445,8 +1458,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
@@ -1527,7 +1539,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
@@ -1575,9 +1586,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
@@ -1654,57 +1662,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
@@ -2868,7 +2825,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