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];
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)
{
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;
}
}
-void centerprint_ClearTitle()
+void centerprint_SetDuelTitle(string left, string right, string div)
{
- strfree(centerprint_title);
- centerprint_title_show = false;
+ strcpy(centerprint_title_left, left);
+ strcpy(centerprint_title_right, right);
+ centerprint_SetTitle(sprintf("^BG%s^BG %s %s", left, div, right));
}
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;
{
if(highlightedPanel == HUD_PANEL(CENTERPRINT))
{
- centerprint_SetTitle(strcat("test", ftos(hud_configure_cp_generation_time)));
+ centerprint_SetTitle(sprintf(_("Title at %s"), seconds_tostring(hud_configure_cp_generation_time)));
float r;
r = random();
centerprint_Add(0, sprintf(_("^1Multiline message at time %s that\n^BOLDlasts longer than normal"), seconds_tostring(time)), 20, 0);
else
centerprint_AddStandard(sprintf(_("Message at time %s"), seconds_tostring(time)));
- //hud_configure_cp_generation_time = time + 1 + random()*4;
- hud_configure_cp_generation_time = time + 1;
+ hud_configure_cp_generation_time = time + 1 + random()*4;
}
else
{
int i, j, k, n, g;
float a = 1, sz, align, current_msg_posY = 0, msg_size;
vector pos;
+ vector cp_fontsize = hud_fontsize * CENTERPRINT_BASE_SIZE;
string ts = "";
bool all_messages_expired = true;
align = bound(0, autocvar_hud_panel_centerprint_align, 1);
// Show title if available
- if(centerprint_title_show) {
- vector fontsize = hud_fontsize * autocvar_hud_panel_centerprint_fontscale_title;
+ if(centerprint_title) {
+ 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;
- drawcolorcodedstring(pos, centerprint_title, fontsize, 1, DRAWFLAG_NORMAL);
if (autocvar_hud_panel_centerprint_flip)
- pos.y -= fontsize.y + (hud_fontsize.y * CENTERPRINT_TITLE_SPACING / 2);
+ 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;
+
+ 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 / 2);
+ pos.y += fontsize.y + (hud_fontsize.y * CENTERPRINT_TITLE_SPACING);
- drawfill(pos, vec2(width, 1), '1 1 1', 1, DRAWFLAG_NORMAL);
+ drawfill(pos, vec2(width, 1), '1 1 1', 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 += hud_fontsize.y * CENTERPRINT_TITLE_SPACING / 2;
+ pos.y += cp_fontsize.y * CENTERPRINT_TITLE_SPACING;
all_messages_expired = false;
}
}
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)
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]) {
- fade_in_time = autocvar_hud_panel_centerprint_fade_in_short;
+ if (centerprint_countdown_num[j] && centerprint_start_time[j]) {
+ fade_in_time = 0;
fade_out_time = 0;
}
if (a <= 0.5/255.0 && centerprint_countdown_num[j] == 0) // Guaranteed invisible - don't show.
continue;
- // set the size from fading in/out before subsequent fading
- sz = autocvar_hud_panel_centerprint_fade_minfontsize + a * (1 - autocvar_hud_panel_centerprint_fade_minfontsize);
-
// also fade it based on positioning
if(autocvar_hud_panel_centerprint_fade_subsequent)
{
}
a *= panel_fg_alpha;
- // finally set the size based on the new alpha from subsequent fading
- // TODO: Apply this only if subsequent, otherwise it fucks it up
- if(g)
- sz = sz * (autocvar_hud_panel_centerprint_fade_subsequent_minfontsize + a * (1 - autocvar_hud_panel_centerprint_fade_subsequent_minfontsize));
+ // finally set the size based on the alpha
+ sz = autocvar_hud_panel_centerprint_fade_minfontsize + a * (1 - autocvar_hud_panel_centerprint_fade_minfontsize);
drawfontscale = hud_scale * sz;
if (centerprint_countdown_num[j])
while(getWrappedLine_remaining)
{
bool is_bold = (substring(getWrappedLine_remaining, 0, 5) == BOLD_OPERATOR);
- vector fontsize = hud_fontsize * (is_bold ? autocvar_hud_panel_centerprint_fontscale_bold : autocvar_hud_panel_centerprint_fontscale);
+ vector fontsize = cp_fontsize * (is_bold ? autocvar_hud_panel_centerprint_fontscale_bold : autocvar_hud_panel_centerprint_fontscale);
ts = getWrappedLine(panel_size.x * hud_scale.x * sz, fontsize, stringwidth_colors);
if (ts != "")
getWrappedLine_remaining = argv(k);
bool is_bold = (substring(getWrappedLine_remaining, 0, 5) == BOLD_OPERATOR);
- vector fontsize = hud_fontsize * (is_bold ? autocvar_hud_panel_centerprint_fontscale_bold : autocvar_hud_panel_centerprint_fontscale);
+ vector fontsize = cp_fontsize * (is_bold ? autocvar_hud_panel_centerprint_fontscale_bold : autocvar_hud_panel_centerprint_fontscale);
if (is_bold)
getWrappedLine_remaining = substring(getWrappedLine_remaining, 5, -1);
if (autocvar_hud_panel_centerprint_flip)
{
- pos.y -= msg_size + CENTERPRINT_SPACING * hud_fontsize.y;
+ pos.y -= msg_size + CENTERPRINT_SPACING * cp_fontsize.y;
if (a < 1 && centerprint_msgID[j] == 0) // messages with id can be replaced just after they are faded out, so never move over them the next messages
pos.y += (1 - sqrt(a));
}
else
{
- pos.y += CENTERPRINT_SPACING * hud_fontsize.y;
+ pos.y += CENTERPRINT_SPACING * cp_fontsize.y;
if (a < 1 && centerprint_msgID[j] == 0) // messages with id can be replaced just after they are faded out, so never move over them the next messages
pos.y -= (1 - sqrt(a));
- if(pos.y > panel_pos.y + panel_size.y - hud_fontsize.y) // check if the next message can be shown
+ if(pos.y > panel_pos.y + panel_size.y - cp_fontsize.y) // check if the next message can be shown
{
drawfontscale = hud_scale;
return;
projects / xonotic / xonotic-data.pk3dir.git / blobdiff