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=e158ce58519d7a9730feae8f08c856a8a5c1da3c;hb=69265650c1b6f1193cf02c99baccb28c0db913ed;hpb=5d9877bbc7fe7817eeb4c04f7463bcb3ded8924b diff --git a/qcsrc/client/hud/panel/centerprint.qc b/qcsrc/client/hud/panel/centerprint.qc index e158ce5851..e5144bd74d 100644 --- a/qcsrc/client/hud/panel/centerprint.qc +++ b/qcsrc/client/hud/panel/centerprint.qc @@ -33,8 +33,9 @@ void HUD_CenterPrint_Export(int fh) const int CENTERPRINT_MAX_MSGS = 10; const int CENTERPRINT_MAX_ENTRIES = 50; -const float CENTERPRINT_SPACING = 0.5; -const float CENTERPRINT_TITLE_SPACING = 0.8; +const float CENTERPRINT_BASE_SIZE = 1.3; +const float CENTERPRINT_SPACING = 0.3; +const float CENTERPRINT_TITLE_SPACING = 0.35; int cpm_index; string centerprint_messages[CENTERPRINT_MAX_MSGS]; int centerprint_msgID[CENTERPRINT_MAX_MSGS]; @@ -44,8 +45,9 @@ float centerprint_expire_time[CENTERPRINT_MAX_MSGS]; int centerprint_countdown_num[CENTERPRINT_MAX_MSGS]; bool centerprint_showing; -bool centerprint_title_show; string centerprint_title; +string centerprint_title_left; +string centerprint_title_right; void centerprint_Add(int new_id, string strMessage, float duration, int countdown_num) { @@ -85,9 +87,10 @@ void centerprint_Add(int new_id, string strMessage, float duration, int countdow j = 0; if (new_id && new_id == centerprint_msgID[j]) { - if (strMessage == "" && centerprint_messages[j] != "" && centerprint_countdown_num[j] == 0) + if (strMessage == "" && centerprint_messages[j] != "") { // fade out the current msg (duration and countdown_num are ignored) + centerprint_start_time[j] = 0; centerprint_time[j] = min(5, autocvar_hud_panel_centerprint_fade_out); centerprint_expire_time[j] = -1; // don't use the variable time here! return; @@ -148,21 +151,24 @@ void centerprint_KillAll() } } -void centerprint_ClearTitle() +void centerprint_SetDuelTitle(string left, string right) { - strfree(centerprint_title); - centerprint_title_show = false; + 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) { - if(title != centerprint_title) { - if(centerprint_title) - strfree(centerprint_title); + if(title != centerprint_title) + strcpy(centerprint_title, CCR(title)); +} - centerprint_title = strzone(title); - centerprint_title_show = true; - } +void centerprint_ClearTitle() +{ + strfree(centerprint_title); + strfree(centerprint_title_left); + strfree(centerprint_title_right); } float hud_configure_cp_generation_time; @@ -188,7 +194,7 @@ void HUD_CenterPrint() { if(highlightedPanel == HUD_PANEL(CENTERPRINT)) { - centerprint_SetTitle(strcat("Title at ", ftos(floor(hud_configure_cp_generation_time)))); + centerprint_SetTitle(sprintf(_("Title at %s"), seconds_tostring(hud_configure_cp_generation_time))); float r; r = random(); @@ -251,7 +257,7 @@ void HUD_CenterPrint() int i, j, k, n, g; float a = 1, sz, align, current_msg_posY = 0, msg_size; vector pos; - vector cp_fontsize = hud_fontsize * 1.4; + vector cp_fontsize = hud_fontsize * CENTERPRINT_BASE_SIZE; string ts = ""; bool all_messages_expired = true; @@ -261,24 +267,72 @@ void HUD_CenterPrint() align = bound(0, autocvar_hud_panel_centerprint_align, 1); // Show title if available - if(centerprint_title_show) { + if(centerprint_title != "" || centerprint_title_left != "") { vector fontsize = cp_fontsize * autocvar_hud_panel_centerprint_fontscale_title; - float width = stringwidth(centerprint_title, true, fontsize); + 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); + } - pos.x = panel_pos.x + (panel_size.x - width) * align; - drawcolorcodedstring(pos, centerprint_title, fontsize, 1, DRAWFLAG_NORMAL); + if (autocvar_hud_panel_centerprint_flip) + pos.y -= fontsize.y; + + 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 -= hud_fontsize.y * (CENTERPRINT_TITLE_SPACING / 2); + pos.y -= cp_fontsize.y * CENTERPRINT_TITLE_SPACING; else - pos.y += fontsize.y + (hud_fontsize.y * (CENTERPRINT_TITLE_SPACING / 2)); + 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 / 2); + pos.y -= cp_fontsize.y * CENTERPRINT_TITLE_SPACING; else - pos.y += cp_fontsize.y * (CENTERPRINT_TITLE_SPACING / 2); + pos.y += cp_fontsize.y * CENTERPRINT_TITLE_SPACING; all_messages_expired = false; } @@ -296,7 +350,7 @@ void HUD_CenterPrint() } if (centerprint_expire_time[j] <= time) { - if (centerprint_countdown_num[j] && centerprint_time[j] > 0) + if (centerprint_countdown_num[j] && centerprint_time[j] > 0 && centerprint_start_time[j]) { centerprint_countdown_num[j] = centerprint_countdown_num[j] - 1; if (centerprint_countdown_num[j] == 0) @@ -314,7 +368,7 @@ void HUD_CenterPrint() float fade_in_time = autocvar_hud_panel_centerprint_fade_in; float fade_out_time = autocvar_hud_panel_centerprint_fade_out; - if (centerprint_countdown_num[j]) { + if (centerprint_countdown_num[j] && centerprint_start_time[j]) { fade_in_time = 0; fade_out_time = 0; }