Cut off long names in the duel centerprint title (same scoreboard limit)

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud / panel / centerprint.qc

diff --git a/qcsrc/client/hud/panel/centerprint.qc b/qcsrc/client/hud/panel/centerprint.qc
index 1436f2ef6a9d48e8675976e190ee76c542847329..0358bed839012cd6b65d94fb5c83cbe35a634874 100644 (file)
--- a/qcsrc/client/hud/panel/centerprint.qc
+++ b/qcsrc/client/hud/panel/centerprint.qc
@@ -153,9 +153,10 @@ void centerprint_KillAll()
 
 void centerprint_SetDuelTitle(string left, string right, string div)
 {
-       strcpy(centerprint_title_left, left);
-       strcpy(centerprint_title_right, right);
-       centerprint_SetTitle(sprintf("^BG%s^BG  %s  %s", left, div, right));
+       float namesize = autocvar_hud_panel_scoreboard_namesize * hud_fontsize.x;
+       strcpy(centerprint_title_left, textShortenToWidth(left, namesize, hud_fontsize, stringwidth_colors));
+       strcpy(centerprint_title_right, textShortenToWidth(right, namesize, hud_fontsize, stringwidth_colors));
+       centerprint_SetTitle(sprintf("^BG%s^BG  %s  %s", centerprint_title_left, div, centerprint_title_right));
 }
 
 void centerprint_SetTitle(string title)
@@ -275,17 +276,30 @@ void HUD_CenterPrint()
 
                if (autocvar_hud_panel_centerprint_flip)
                        pos.y -= fontsize.y;
-               if (centerprint_title_left != "" && align == 0.5) // Center line at the main word (for duels)
-                       pos.x += (stringwidth(centerprint_title_right, true, fontsize) - stringwidth(centerprint_title_left, true, fontsize)) / 2;
+               float right_width = 0;
+               float left_width = 0;
+               if (centerprint_title_left != "")
+               {
+                       right_width = stringwidth(centerprint_title_right, true, fontsize);
+                       left_width = stringwidth(centerprint_title_left, true, fontsize);
+                       if (align == 0.5) // Center line at the main word (for duels)
+                               pos.x += (right_width - left_width) / 2;
+               }
 
-               drawcolorcodedstring(pos, centerprint_title, fontsize, 1, DRAWFLAG_NORMAL);
+               drawcolorcodedstring(pos, centerprint_title, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
 
                if (autocvar_hud_panel_centerprint_flip)
                        pos.y -= cp_fontsize.y * CENTERPRINT_TITLE_SPACING;
                else
                        pos.y += fontsize.y + (hud_fontsize.y * CENTERPRINT_TITLE_SPACING);
 
-               drawfill(pos, vec2(width, 1), '1 1 1', 1, DRAWFLAG_NORMAL);
+               if (centerprint_title_left != "")
+               {
+                       drawfill(pos, vec2(left_width, 1), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+                       drawfill(pos + vec2(width - right_width, 1), vec2(right_width, 1), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+               }
+               else
+                       drawfill(pos, vec2(width, 1), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
 
                if (autocvar_hud_panel_centerprint_flip)
                        pos.y -= cp_fontsize.y * CENTERPRINT_TITLE_SPACING;