X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fscoreboard.qc;h=83c487419b7fe00a35b053594abbec9fca64a095;hb=2131fc86c8a55826aa6a424f3ffe6b2d09f28b7a;hp=416564cc9c0121d8501d177307921b8401914d5f;hpb=9219e1f701c6cdda3d0b5344d06078c5ae8769d4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
index 416564cc9..83c487419 100644
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -80,7 +80,6 @@ float autocvar_hud_panel_scoreboard_table_highlight_alpha = 0.2;
 float autocvar_hud_panel_scoreboard_table_highlight_alpha_self = 0.4;
 float autocvar_hud_panel_scoreboard_table_highlight_alpha_eliminated = 0.6;
 float autocvar_hud_panel_scoreboard_bg_teams_color_team = 0;
-float autocvar_hud_panel_scoreboard_namesize = 15;
 float autocvar_hud_panel_scoreboard_team_size_position = 0;
 float autocvar_hud_panel_scoreboard_spectators_position = 1;
 
@@ -185,6 +184,8 @@ void HUD_Scoreboard_UI_Disable_Instantly()
 // mode: 0 normal, 1 team selection
 void Scoreboard_UI_Enable(int mode)
 {
+	if(isdemo()) return;
+
 	if (mode == 1)
 	{
 		if (scoreboard_ui_enabled == 2 || !teamplay || intermission)
@@ -435,12 +436,7 @@ float HUD_Scoreboard_InputEvent(float bInputType, float nPrimary, float nSeconda
 				localcmd(sprintf("cmd selectteam %s; cmd join\n", team_name));
 				HUD_Scoreboard_UI_Disable();
 			}
-			else if (!scoreboard_selected_player || (hudShiftState & S_SHIFT))
-			{
-				localcmd("join\n");
-				HUD_Scoreboard_UI_Disable();
-			}
-			else
+			else if (scoreboard_selected_player)
 				localcmd(sprintf("spectate %d\n", scoreboard_selected_player.sv_entnum + 1));
 		}
 	}
@@ -2042,7 +2038,7 @@ vector Scoreboard_Rankings_Draw(vector pos, string ranktitle, entity pl, vector
 
 		str = count_ordinal(i+1);
 		drawstring(pos + text_ofs, str, hud_fontsize, '1 1 1', sbt_fg_alpha, DRAWFLAG_NORMAL);
-		drawstring(pos + text_ofs + eX * ranksize, TIME_ENCODED_TOSTRING(t), hud_fontsize, '1 1 1', sbt_fg_alpha, DRAWFLAG_NORMAL);
+		drawstring(pos + text_ofs + eX * ranksize, TIME_ENCODED_TOSTRING(t, true), hud_fontsize, '1 1 1', sbt_fg_alpha, DRAWFLAG_NORMAL);
 		str = ColorTranslateRGB(grecordholder[i]);
 		if(cut)
 			str = textShortenToWidth(str, namesize, hud_fontsize, stringwidth_colors);
@@ -2525,8 +2521,7 @@ void Scoreboard_Draw()
 
 	// print information about respawn status
 	float respawn_time = STAT(RESPAWN_TIME);
-	if(!intermission)
-	if(respawn_time)
+	if(!intermission && respawn_time)
 	{
 		if(respawn_time < 0)
 		{