Fixed centerprint title size

[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 22824a1719cf774bb6aec06f20f48fb00631b994..778892b914be8bc56252ce3b224634fcf891aa61 100644 (file)
--- a/qcsrc/client/hud/panel/centerprint.qc
+++ b/qcsrc/client/hud/panel/centerprint.qc
@@ -34,7 +34,7 @@ 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 = 1;
+const float CENTERPRINT_TITLE_SPACING = 0.8;
 int cpm_index;
 string centerprint_messages[CENTERPRINT_MAX_MSGS];
 int centerprint_msgID[CENTERPRINT_MAX_MSGS];
@@ -96,6 +96,9 @@ void centerprint_Add(int new_id, string strMessage, float duration, int countdow
                }
        }
 
+       if (strMessage == "")
+               return;
+
        if (i == CENTERPRINT_MAX_MSGS)
        {
                // a msg with the same id was not found, add the msg at the next position
@@ -185,7 +188,7 @@ void HUD_CenterPrint()
                {
                        if(highlightedPanel == HUD_PANEL(CENTERPRINT))
                        {
-                               centerprint_SetTitle(strcat("test", ftos(hud_configure_cp_generation_time)));
+                               centerprint_SetTitle(strcat("Title at ", ftos(floor(hud_configure_cp_generation_time))));
 
                                float r;
                                r = random();
@@ -195,8 +198,7 @@ void HUD_CenterPrint()
                                        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
                        {
@@ -249,6 +251,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.1;
        string ts = "";
        bool all_messages_expired = true;
 
@@ -259,15 +262,23 @@ void HUD_CenterPrint()
 
        // Show title if available
        if(centerprint_title_show) {
-               vector fontsize = hud_fontsize * autocvar_hud_panel_centerprint_fontscale_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 - stringwidth(centerprint_title, true, fontsize)) * align;
+               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 + CENTERPRINT_TITLE_SPACING;
+                       pos.y -= cp_fontsize.y * (CENTERPRINT_TITLE_SPACING / 2);
                else
-                       pos.y += fontsize.y + CENTERPRINT_TITLE_SPACING;
+                       pos.y += fontsize.y + (cp_fontsize.y * (CENTERPRINT_TITLE_SPACING / 2));
+
+               drawfill(pos, vec2(width, 1), '1 1 1', 1, DRAWFLAG_NORMAL);
+
+               if (autocvar_hud_panel_centerprint_flip)
+                       pos.y -= cp_fontsize.y * (CENTERPRINT_TITLE_SPACING / 2);
+               else
+                       pos.y += cp_fontsize.y * (CENTERPRINT_TITLE_SPACING / 2);
 
                all_messages_expired = false;
        }
@@ -323,9 +334,6 @@ void HUD_CenterPrint()
                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)
                {
@@ -336,10 +344,8 @@ void HUD_CenterPrint()
                }
                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])
@@ -356,7 +362,7 @@ void HUD_CenterPrint()
                                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 != "")
@@ -374,7 +380,7 @@ void HUD_CenterPrint()
                        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);
 
@@ -402,7 +408,7 @@ void HUD_CenterPrint()
 
                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));
 
@@ -414,11 +420,11 @@ void HUD_CenterPrint()
                }
                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;