X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fcenterprint.qc;h=e5144bd74d7c8d7c0da2f0faab64122cab22ba74;hp=307e3c899a52504a30b464dfcd5c3ee45ff70308;hb=69265650c1b6f1193cf02c99baccb28c0db913ed;hpb=d2b0f12cb08fe3d1e59d3c9514546c4858cf9012

diff --git a/qcsrc/client/hud/panel/centerprint.qc b/qcsrc/client/hud/panel/centerprint.qc
index 307e3c899a..e5144bd74d 100644
--- a/qcsrc/client/hud/panel/centerprint.qc
+++ b/qcsrc/client/hud/panel/centerprint.qc
@@ -46,7 +46,8 @@ int centerprint_countdown_num[CENTERPRINT_MAX_MSGS];
 bool centerprint_showing;
 
 string centerprint_title;
-float centerprint_title_offset;
+string centerprint_title_left;
+string centerprint_title_right;
 
 void centerprint_Add(int new_id, string strMessage, float duration, int countdown_num)
 {
@@ -150,18 +151,24 @@ void centerprint_KillAll()
 	}
 }
 
-void centerprint_ClearTitle()
+void centerprint_SetDuelTitle(string left, string right)
 {
-	strfree(centerprint_title);
-	centerprint_title_offset = 0;
+	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));
 }
 
-void centerprint_SetTitle(string title, float offset)
+void centerprint_SetTitle(string title)
 {
-	if(title != centerprint_title) {
+	if(title != centerprint_title)
 		strcpy(centerprint_title, CCR(title));
-		centerprint_title_offset = offset;
-	}
+}
+
+void centerprint_ClearTitle()
+{
+	strfree(centerprint_title);
+	strfree(centerprint_title_left);
+	strfree(centerprint_title_right);
 }
 
 float hud_configure_cp_generation_time;
@@ -187,7 +194,7 @@ void HUD_CenterPrint()
 		{
 			if(highlightedPanel == HUD_PANEL(CENTERPRINT))
 			{
-				centerprint_SetTitle(sprintf(_("Title at %s"), seconds_tostring(hud_configure_cp_generation_time)), 0);
+				centerprint_SetTitle(sprintf(_("Title at %s"), seconds_tostring(hud_configure_cp_generation_time)));
 
 				float r;
 				r = random();
@@ -260,25 +267,67 @@ void HUD_CenterPrint()
 	align = bound(0, autocvar_hud_panel_centerprint_align, 1);
 
 	// Show title if available
-	if(centerprint_title) {
+	if(centerprint_title != "" || centerprint_title_left != "") {
 		vector fontsize = cp_fontsize * autocvar_hud_panel_centerprint_fontscale_title;
-		float width = stringwidth(centerprint_title, true, fontsize);
-
-		pos.x = panel_pos.x + (panel_size.x - width) * align;
+		float width = 0, right_width = 0, left_width = 0,  max_rl_width = 0;
+		if (centerprint_title != "")
+		{
+			width = stringwidth(centerprint_title, true, fontsize);
+		}
+		else
+		{
+			right_width = stringwidth(centerprint_title_right, true, fontsize);
+			left_width = stringwidth(centerprint_title_left, true, fontsize);
+		}
 
 		if (autocvar_hud_panel_centerprint_flip)
 			pos.y -= fontsize.y;
-		if (centerprint_title_offset && align == 0.5)
-			pos.x += centerprint_title_offset * CENTERPRINT_BASE_SIZE * autocvar_hud_panel_centerprint_fontscale_title;
 
-		drawcolorcodedstring(pos, centerprint_title, fontsize, 1, DRAWFLAG_NORMAL);
+		vector duel_title_pos = '0 0 0';
+		float padding = stringwidth(" ", false, fontsize) * 2;
+		if (centerprint_title_left != "")
+		{
+			if (left_width > right_width)
+				max_rl_width = left_width;
+			else
+				max_rl_width = right_width;
+
+			width = max_rl_width * 2 + padding * 6 + stringwidth(_("vs"), false, fontsize);
+			pos.x += (panel_size.x - width) * align;
+			duel_title_pos = pos;
+
+			pos.x += padding;
+			if (left_width < right_width)
+				pos.x += (max_rl_width - left_width) * 0.5;
+			drawcolorcodedstring(pos, centerprint_title_left, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+
+			pos.x = duel_title_pos.x + max_rl_width + padding * 3;
+			drawstring(pos, _("vs"), fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+
+			pos.x = duel_title_pos.x + width - padding - max_rl_width;
+			if (left_width >= right_width)
+				pos.x += (max_rl_width - right_width) * 0.5;
+			drawcolorcodedstring(pos, centerprint_title_right, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+		}
+		else
+		{
+			pos.x = panel_pos.x + (panel_size.x - width) * align;
+			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 != "")
+		{
+			pos.x = duel_title_pos.x;
+			drawfill(pos, vec2(max_rl_width + padding * 2, 1), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+			drawfill(pos + vec2(width - max_rl_width - padding * 2, 0), vec2(max_rl_width + padding * 2, 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;