Remove the team bubble, now that we have new shownames

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

diff --git a/data/models/misc/teambubble.spr_0.tga b/data/models/misc/teambubble.spr_0.tga
deleted file mode 100644 (file)
index 9c6af1e..0000000
Binary files a/data/models/misc/teambubble.spr_0.tga and /dev/null differ

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

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

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 7ecabb603e41ae67b9f56d840f97191bb7997ed4..d9b9437d4c131af06041a9b5df0316a5d99f9663 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -1534,7 +1534,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
@@ -1582,9 +1581,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
@@ -1661,57 +1657,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
@@ -2875,7 +2820,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

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 245d0a08c8bcb6ea089e775d816c22319f4e9263..8111f535523e7bf3216fda5e246163e628e212a5 100644 (file)
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -1332,8 +1332,6 @@ void precache()
 {\r
     // 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