X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fscoreboard.qc;h=8e024ead5b0c7fdeb36865a802c9378bf55ba7bf;hb=650b75b9a9e48d782653ed7f33bab05df8d7e00c;hp=517065ac5dd02fade24a500103bdb580dc09e26e;hpb=3f0620ef10b0c142cfb2f64d87af78c1243766c6;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index 517065ac5..8e024ead5 100644
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -365,7 +365,7 @@ void Cmd_HUD_SetFields(float argc)
 
 		strunzone(hud_title[hud_num_fields]);
 		hud_title[hud_num_fields] = strzone(TranslateScoresLabel(str));
-		hud_size[hud_num_fields] = stringwidth(str, FALSE, hud_fontsize);
+		hud_size[hud_num_fields] = stringwidth(hud_title[hud_num_fields], FALSE, hud_fontsize);
 		str = strtolower(str);
 
 		if(str == "ping") {
@@ -923,9 +923,7 @@ float HUD_WouldDrawScoreboard() {
 		return 1;
 	else if (intermission == 2)
 		return 0;
-	else if (getstati(STAT_HEALTH) <= 0 && autocvar_cl_deathscoreboard && gametype != GAME_CTS)
-		return 1;
-	else if (spectatee_status == -1)
+	else if (spectatee_status != -1 && getstati(STAT_HEALTH) <= 0 && autocvar_cl_deathscoreboard && gametype != GAME_CTS)
 		return 1;
 	else if (scoreboard_showscores_force)
 		return 1;
@@ -1252,12 +1250,12 @@ void HUD_DrawScoreboard()
 	if(gametype == GAME_LMS)
 	{
 		if(tl > 0)
-			str = strcat(str, sprintf(_(" for up to ^1%.1f minutes^7"), tl));
+			str = strcat(str, sprintf(_(" for up to ^1%1.0f minutes^7"), tl));
 	}
 	else
 	{
 		if(tl > 0)
-			str = strcat(str, sprintf(_(" for up to ^1%.1f minutes^7"), tl));
+			str = strcat(str, sprintf(_(" for up to ^1%1.0f minutes^7"), tl));
 		if(fl > 0)
 		{
 			if(tl > 0)