From: z411 <z411@omaera.org>
Date: Thu, 15 Oct 2020 17:32:35 +0000 (-0300)
Subject: Icon/flag in duel scoreboard
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4226207ec380cd3be64e698fe5f8e574a75a9fa7;p=xonotic%2Fxonotic-data.pk3dir.git

Icon/flag in duel scoreboard
---

diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
index 84412ec0c..579ff9558 100644
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -1165,9 +1165,21 @@ void Scoreboard_Duel_DrawTable(vector pos, bool invert, entity pl, entity tm)
 		tmp_in.x -= stringwidth_colors(tmp_str, duel_name_fontsize) + duel_name_fontsize.x * 0.5;
 	else
 		tmp_in.x += duel_score_size.x + duel_name_fontsize.x * 0.5;
-	tmp_in.y += (duel_score_size.y / 2) - (duel_name_fontsize.y / 2);
+	tmp_in.y += (duel_score_size.y - duel_name_fontsize.y) / 2;
 	drawcolorcodedstring(tmp_in, tmp_str, duel_name_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
 	
+	// Player icon/flag
+	if(sbt_field_icon0 != "") {
+		vector rsz = draw_getimagesize(sbt_field_icon0);
+		sbt_fixcolumnwidth_iconlen = rsz.x / rsz.y;
+		if(invert)
+			tmp_in.x -= hud_fontsize.x * sbt_fixcolumnwidth_iconlen + duel_name_fontsize.x * 0.5;
+		else
+			tmp_in.x += stringwidth_colors(tmp_str, duel_name_fontsize) + duel_name_fontsize.x * 0.5;
+		tmp_in.y += (duel_name_fontsize.y - hud_fontsize.y) / 2;
+		drawpic(tmp_in, sbt_field_icon0, vec2(hud_fontsize.x * sbt_fixcolumnwidth_iconlen, hud_fontsize.y), sbt_field_icon1_rgb, panel_fg_alpha, DRAWFLAG_NORMAL);
+	}
+	
 	// Header
 	float column_width = panel_size.x / 5;
 	tmp.x = pos.x + panel_bg_padding;