From: Mario <mario.mario@y7mail.com>
Date: Fri, 23 May 2014 13:53:38 +0000 (+1000)
Subject: Hide accuracy while spectating or playing nexball, show current gametype in the ... 
X-Git-Tag: xonotic-v0.8.0~204^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cb47301829e82ede2adfcde9614c58b5372e0e46;p=xonotic%2Fxonotic-data.pk3dir.git

Hide accuracy while spectating or playing nexball, show current gametype in the "playing on" scoreboard info string, hide respawn countdown after match has ended
---

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index dd419ae22..46dcfb4c4 100644
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -1313,7 +1313,7 @@ void HUD_DrawScoreboard()
 		}
 		pos = HUD_DrawScoreboardRankings(pos, playerslots[player_localnum], rgb, bg_size);
 	}
-	else if(autocvar_scoreboard_accuracy && spectatee_status != -1 && !warmup_stage) {
+	else if(autocvar_scoreboard_accuracy && spectatee_status == 0 && !warmup_stage && gametype != MAPINFO_TYPE_NEXBALL) {
 		if(teamplay)
 			pos = HUD_DrawScoreboardAccuracyStats(pos, Team_ColorRGB(myteam), bg_size);
 		else
@@ -1349,7 +1349,7 @@ void HUD_DrawScoreboard()
 
 	// Print info string
 	float tl, fl, ll;
-	str = sprintf(_("playing on ^2%s^7"), shortmapname);
+	str = sprintf(_("playing ^3%s^7 on ^2%s^7"), MapInfo_Type_ToText(gametype), shortmapname);
 	tl = getstatf(STAT_TIMELIMIT);
 	fl = getstatf(STAT_FRAGLIMIT);
 	ll = getstatf(STAT_LEADLIMIT);
@@ -1407,6 +1407,7 @@ void HUD_DrawScoreboard()
 
 	// print information about respawn status
 	float respawn_time = getstatf(STAT_RESPAWN_TIME);
+	if(!intermission)
 	if(respawn_time)
 	{
 		if(respawn_time < 0)