Merge branch 'master' into develop

[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 ec11e1bac1048ecdde99a076abf5db4b954aec01..307e3c899a52504a30b464dfcd5c3ee45ff70308 100644 (file)
--- 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,8 @@ float centerprint_expire_time[CENTERPRINT_MAX_MSGS];
 int centerprint_countdown_num[CENTERPRINT_MAX_MSGS];
 bool centerprint_showing;
 
-bool centerprint_title_show;
 string centerprint_title;
+float centerprint_title_offset;
 
 void centerprint_Add(int new_id, string strMessage, float duration, int countdown_num)
 {
@@ -85,9 +86,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;
@@ -151,17 +153,14 @@ void centerprint_KillAll()
 void centerprint_ClearTitle()
 {
        strfree(centerprint_title);
-       centerprint_title_show = false;
+       centerprint_title_offset = 0;
 }
 
-void centerprint_SetTitle(string title)
+void centerprint_SetTitle(string title, float offset)
 {
        if(title != centerprint_title) {
-               if(centerprint_title)
-                       strfree(centerprint_title);
-
-               centerprint_title = strzone(title);
-               centerprint_title_show = true;
+               strcpy(centerprint_title, CCR(title));
+               centerprint_title_offset = offset;
        }
 }
 
@@ -188,7 +187,7 @@ void HUD_CenterPrint()
                {
                        if(highlightedPanel == HUD_PANEL(CENTERPRINT))
                        {
-                               centerprint_SetTitle(sprintf(_("Title at %s"), seconds_tostring(hud_configure_cp_generation_time)));
+                               centerprint_SetTitle(sprintf(_("Title at %s"), seconds_tostring(hud_configure_cp_generation_time)), 0);
 
                                float r;
                                r = random();
@@ -251,7 +250,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,27 +260,30 @@ void HUD_CenterPrint()
        align = bound(0, autocvar_hud_panel_centerprint_align, 1);
 
        // Show title if available
-       if(centerprint_title_show) {
+       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;
+
                if (autocvar_hud_panel_centerprint_flip)
-                       pos.y -= cp_fontsize.y;
+                       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;
 
-               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 -= cp_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 (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;
        }
@@ -299,7 +301,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)
@@ -317,7 +319,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;
                }