Team heal indicator for the team bubble. You will now see an additional Heal panel...

diff --git a/data/models/misc/teambubbleheal.spr b/data/models/misc/teambubbleheal.spr
new file mode 100644 (file)
index 0000000..33063d4
Binary files /dev/null and b/data/models/misc/teambubbleheal.spr differ

diff --git a/data/models/misc/teambubbleheal.spr_0.tga b/data/models/misc/teambubbleheal.spr_0.tga
new file mode 100644 (file)
index 0000000..379d670
Binary files /dev/null and b/data/models/misc/teambubbleheal.spr_0.tga differ

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 987938627b4abd3a5a006f589a068e43078f1717..3bf2ff0dc364c347cf95544ce1ed44ef716750b5 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -1624,7 +1624,6 @@ void UpdateChatBubble()
        }\r
 }\r
 \r
-\r
 void TeamBubbleThink()\r
 {\r
        self.nextthink = time;\r
@@ -1639,8 +1638,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 +1667,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

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 84abf8641e2f4864ad862e42a7e7bfe07a08de5b..357e93ce73992f59a2690c6691541e0477bc7f3a 100644 (file)
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -1332,6 +1332,7 @@ void precache()
     // gamemode related things\r
     precache_model ("models/misc/chatbubble.spr");\r
     precache_model ("models/misc/teambubble.spr");\r
+       precache_model ("models/misc/teambubbleheal.spr");\r
 \r
        // used by the waypoint editor\r
        precache_model ("models/rune.mdl");\r