From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 9 Jul 2011 00:40:54 +0000 (+0300)
Subject: Remove the team bubble, now that we have new shownames
X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=0116523cfd2d6dfeccd0c487d6dd3e0fab2acf92

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
index 33063d43..00000000
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
index 9c6af1e9..00000000
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
index 33063d43..00000000
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
index 379d670c..00000000
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 7ecabb60..d9b9437d 100644
--- 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
 =============
 */
 .entity chatbubbleentity;
-.entity teambubbleentity;
 void ReadyCount();
 void ClientDisconnect (void)
 {
@@ -1582,9 +1581,6 @@ void ClientDisconnect (void)
 	if (self.chatbubbleentity)
 		remove (self.chatbubbleentity);
 
-	if (self.teambubbleentity)
-		remove (self.teambubbleentity);
-
 	if (self.killindicator)
 		remove (self.killindicator);
 
@@ -1661,57 +1657,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.owner.stat_eaten)
-		self.model = "";
-	else
-	{
-		if(cvar("g_balance_vore_teamheal") && cvar("g_vore_teamvore"))
-		if(self.owner.health < cvar("g_balance_vore_teamheal_stable"))
-			setmodel(self, "models/misc/teambubbleheal.spr"); // indicate that this player can be teamhealed
-		else
-			setmodel(self, "models/misc/teambubble.spr");
-	}
-};
-
-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()
@@ -2875,7 +2820,6 @@ void PlayerPostThink (void)
 	if(self.classname == "player") {
 		CheckRules_Player();
 		UpdateChatBubble();
-		UpdateTeamBubble();
 		if (self.impulse)
 			ImpulseCommands();
 		if (intermission_running)
diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 245d0a08..8111f535 100644
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -1332,8 +1332,6 @@ void precache()
 {
     // gamemode related things
     precache_model ("models/misc/chatbubble.spr");
-    precache_model ("models/misc/teambubble.spr");
-	precache_model ("models/misc/teambubbleheal.spr");
 
 	// used by the waypoint editor
 	precache_model ("models/rune.mdl");