From: terencehill <piuntn@gmail.com>
Date: Sat, 21 May 2022 16:52:01 +0000 (+0200)
Subject: Scoreboard team selection: improve messages
X-Git-Tag: xonotic-v0.8.6~409^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6b816d6de918defac7e7ae70a538cc3116cfdb71;p=xonotic%2Fxonotic-data.pk3dir.git

Scoreboard team selection: improve messages
---

diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
index f1a943c04..d34bdc35e 100644
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -2194,14 +2194,10 @@ void Scoreboard_Draw()
 	sb_gameinfo_detail_fontsize = hud_fontsize * 1.3;
 
 	// Game Info: Game Type
-	str = MapInfo_Type_ToText(gametype);
 	if (scoreboard_ui_enabled == 2)
-	{
-		if (scoreboard_selected_team)
-			str = sprintf(_("^7Press ^3%s ^7to join the selected team"), getcommandkey(_("jump"), "+jump"));
-		else
-			str = sprintf(_("^7Press ^3%s ^7to join 'best' team (auto-select)"), getcommandkey(_("jump"), "+jump"));
-	}
+		str = _("Team Selection");
+	else
+		str = MapInfo_Type_ToText(gametype);
 	draw_beginBoldFont();
 	drawcolorcodedstring(pos + '0.5 0 0' * (panel_size.x - stringwidth(str, true, sb_gameinfo_type_fontsize)), str, sb_gameinfo_type_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
 	draw_endBoldFont();
@@ -2210,6 +2206,13 @@ void Scoreboard_Draw()
 	// Game Info: Game Detail
 	if (scoreboard_ui_enabled == 2)
 	{
+		if (scoreboard_selected_team)
+			str = sprintf(_("^7Press ^3%s ^7to join the selected team"), getcommandkey(_("jump"), "+jump"));
+		else
+			str = sprintf(_("^7Press ^3%s ^7 to auto-select a team and join"), getcommandkey(_("jump"), "+jump"));
+		drawcolorcodedstring(pos + '0.5 0 0' * (panel_size.x - stringwidth(str, true, sb_gameinfo_detail_fontsize)), str, sb_gameinfo_detail_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+
+		pos.y += sb_gameinfo_detail_fontsize.y + hud_fontsize.y * 0.3;
 		str = sprintf(_("^7Press ^3%s ^7to select a specific team"), translate_key("TAB"));
 		drawcolorcodedstring(pos + '0.5 0 0' * (panel_size.x - stringwidth(str, true, sb_gameinfo_detail_fontsize)), str, sb_gameinfo_detail_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
 	}