From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 7 Sep 2010 22:55:08 +0000 (+0300)
Subject: Team heal indicator for the team bubble. You will now see an additional Heal panel... 
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=ef29ccb63cd714e88aaad2e43983317ffc933174;p=voretournament%2Fvoretournament.git

Team heal indicator for the team bubble. You will now see an additional Heal panel on the team bubble when someone can be healed.
---

diff --git a/data/models/misc/teambubbleheal.spr b/data/models/misc/teambubbleheal.spr
new file mode 100644
index 00000000..33063d43
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
index 00000000..379d670c
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 98793862..3bf2ff0d 100644
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -1624,7 +1624,6 @@ void UpdateChatBubble()
 	}
 }
 
-
 void TeamBubbleThink()
 {
 	self.nextthink = time;
@@ -1639,8 +1638,12 @@ void TeamBubbleThink()
 	if (self.owner.BUTTON_CHAT || self.owner.deadflag || self.owner.killindicator || self.owner.eater.classname == "player")
 		self.model = "";
 	else
-		self.model = self.mdl;
-
+	{
+		if(cvar("g_balance_vore_teamheal") && 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()
@@ -1664,8 +1667,8 @@ void UpdateTeamBubble()
 //		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.mdl = self.teambubbleentity.model;
+//		self.teambubbleentity.model = self.teambubbleentity.mdl;
 		self.teambubbleentity.customizeentityforclient = TeamBubble_customizeentityforclient;
 		self.teambubbleentity.effects = EF_LOWPRECISION;
 	}
diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 84abf864..357e93ce 100644
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -1332,6 +1332,7 @@ 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");