From 220c64aeeea18be429de5865715546361053b41d Mon Sep 17 00:00:00 2001
From: FruitieX <fruitiex@gmail.com>
Date: Sun, 15 May 2011 04:15:03 +0300
Subject: [PATCH] woops remove silly entity leak

---
 qcsrc/server/cl_client.qc     | 64 +++++------------------------------
 qcsrc/server/miscfunctions.qc |  1 -
 2 files changed, 8 insertions(+), 57 deletions(-)

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 69456ab01..52d1a89be 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1103,11 +1103,14 @@ void PutClientInServer (void)
 		PutObserverInServer ();
 	}
 
-    self.shownames = spawn();
-    self.shownames.owner = self;
-    self.shownames.think = shownames_think;
-    self.shownames.nextthink = time;
-    Net_LinkEntity(self.shownames, FALSE, 0, SendEntity_ShowNames);
+    if(!self.shownames)
+    {
+        self.shownames = spawn();
+        self.shownames.owner = self;
+        self.shownames.think = shownames_think;
+        self.shownames.nextthink = time;
+        Net_LinkEntity(self.shownames, FALSE, 0, SendEntity_ShowNames);
+    }
 
 	//if(g_ctf)
 	//	ctf_playerchanged();
@@ -1792,7 +1795,6 @@ Called when a client disconnects from the server
 =============
 */
 .entity chatbubbleentity;
-.entity teambubbleentity;
 void ReadyCount();
 void ClientDisconnect (void)
 {
@@ -1846,9 +1848,6 @@ void ClientDisconnect (void)
 	if (self.chatbubbleentity)
 		remove (self.chatbubbleentity);
 
-	if (self.teambubbleentity)
-		remove (self.teambubbleentity);
-
 	if (self.killindicator)
 		remove (self.killindicator);
 
@@ -1931,52 +1930,6 @@ void UpdateChatBubble()
 }
 
 
-void TeamBubbleThink()
-{
-	self.nextthink = time;
-	if (!self.owner.modelindex || self.owner.teambubbleentity != self)
-	{
-		if(self.owner) // but why can that ever be world?
-			self.owner.teambubbleentity = world;
-		remove(self);
-		return;
-	}
-//	setorigin(self, self.owner.origin + '0 0 15' + self.owner.maxs_z * '0 0 1');  // bandwidth hog. setattachment does this now
-	if (self.owner.BUTTON_CHAT || self.owner.deadflag || self.owner.killindicator)
-		self.model = "";
-	else
-		self.model = self.mdl;
-
-};
-
-float TeamBubble_customizeentityforclient()
-{
-	return (self.owner != other && self.owner.team == other.team && other.killcount > -666);
-}
-
-void UpdateTeamBubble()
-{
-	if (!self.modelindex || !teams_matter)
-		return;
-	// spawn a teambubble entity if needed
-	if (!self.teambubbleentity && teams_matter)
-	{
-		self.teambubbleentity = spawn();
-		self.teambubbleentity.owner = self;
-		self.teambubbleentity.exteriormodeltoclient = self;
-		self.teambubbleentity.think = TeamBubbleThink;
-		self.teambubbleentity.nextthink = time;
-		setmodel(self.teambubbleentity, "models/misc/teambubble.spr"); // precision set below
-//		setorigin(self.teambubbleentity, self.origin + '0 0 15' + self.maxs_z * '0 0 1');
-		setorigin(self.teambubbleentity, '0 0 15' + self.maxs_z * '0 0 1');
-		setattachment(self.teambubbleentity, self, "");  // sticks to moving player better, also conserves bandwidth
-		self.teambubbleentity.mdl = self.teambubbleentity.model;
-		self.teambubbleentity.model = self.teambubbleentity.mdl;
-		self.teambubbleentity.customizeentityforclient = TeamBubble_customizeentityforclient;
-		self.teambubbleentity.effects = EF_LOWPRECISION;
-	}
-}
-
 // LordHavoc: this hack will be removed when proper _pants/_shirt layers are
 // added to the model skins
 /*void UpdateColorModHack()
@@ -3103,7 +3056,6 @@ void PlayerPostThink (void)
 	if(self.classname == "player") {
 		CheckRules_Player();
 		UpdateChatBubble();
-		UpdateTeamBubble();
 		if (self.impulse)
 			ImpulseCommands();
 		if (intermission_running)
diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 0602ed9d8..fa05d7163 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -1555,7 +1555,6 @@ void precache()
 {
     // gamemode related things
     precache_model ("models/misc/chatbubble.spr");
-    precache_model ("models/misc/teambubble.spr");
     if (g_runematch)
     {
         precache_model ("models/runematch/curse.mdl");
-- 
2.39.2