From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 15 Mar 2012 14:44:42 +0000 (+0200)
Subject: Allow observers to see player names, and also show the health of team mates to specta... 
X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=56b422e9e319c73cb9457756380f7f42e68c5159

Allow observers to see player names, and also show the health of team mates to spectated team members
---

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 0aeb2bce..b655404e 100644
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1197,6 +1197,7 @@ seta hud_contents_stomach_alpha 0.2 "alpha of the stomach color blend when insid
 seta hud_contents_stomach_color "0.3 0.2 0"
 
 seta hud_shownames 2 "1 = draw names of nearby team mates, 2 = also draw names of nearby enemies"
+seta hud_shownames_observers 1 "allow observers to see player names"
 seta hud_shownames_status 2 "1 = show when the team mate can be healed, 2 = also show health, 3 = also show armor"
 seta hud_shownames_aspect 8 "aspect ratio of total drawing area per name"
 seta hud_shownames_fontsize 8 "font size"
diff --git a/data/qcsrc/client/shownames.qc b/data/qcsrc/client/shownames.qc
index eae0e54b..32bd0f49 100644
--- a/data/qcsrc/client/shownames.qc
+++ b/data/qcsrc/client/shownames.qc
@@ -9,7 +9,7 @@ void Draw_ShowNames(entity ent)
 {
 	if(!cvar("hud_shownames"))
 		return;
-	if(spectatee_status < 0)
+	if(spectatee_status < 0 && !cvar("hud_shownames_observers"))
 		return;
 	if(ent.sv_entnum == player_localentnum && !cvar("chase_active"))
 		return;
@@ -19,7 +19,8 @@ void Draw_ShowNames(entity ent)
 		return;
 
 	float sameteam;
-	if(teamplay && (GetPlayerColor(player_localentnum - 1) == GetPlayerColor(ent.sv_entnum - 1)))
+	if(teamplay && spectatee_status >= 0)
+	if((GetPlayerColor(player_localentnum - 1) == GetPlayerColor(ent.sv_entnum - 1)) || (GetPlayerColor(spectatee_status - 1) == GetPlayerColor(ent.sv_entnum - 1)))
 		sameteam = TRUE;
 
 	if(sameteam || (!sameteam && cvar("hud_shownames") > 1))
diff --git a/docs/TODO.txt b/docs/TODO.txt
index 83c21598..9bdf66b7 100644
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -120,8 +120,6 @@
 
 - 0.7 | 0.8: The stomach gurgle sound duration does not match the pitch properly
 
-- 0.8: Maybe shownames can work for neighboring prey?
-
 - 0.8: Make menu song depend on the menu skin?
 
 - 0.7 | 0.8: Always play the eating animations when the fire button is down? OR play an error sound saying "there is nothing to vore"
@@ -150,4 +148,12 @@
 
 - 0.7 | 0.8: Water on Arahia is too bright
 
-- +0.8: Create a recommended bot number for maps in mapinfo
\ No newline at end of file
+- +0.8: Create a recommended bot number for maps in mapinfo
+
+- 0.7 | 0.8 BUG: Don't play stomach load helper sound for your predator's status!
+
+- 0.7 | 0.8: Allow more bots from the menu?
+
+- 0.7 BUG: When spectating a player, maximum stomach load appears as 0 on the HUD
+
+- 0.8: Maybe turn the HEAL teammate into a sign, not part of shownames
\ No newline at end of file