Add capitalize option

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index 7a7b063dc9349dfc982fed6ca0581c4b999e1788..1436470225ded12868a0f370af2c18b8aaf674d3 100644 (file)
--- a/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@ -275,6 +275,7 @@ seta hud_panel_centerprint_bg_padding "" "if set to something else than \"\" = o
 seta hud_panel_centerprint_align "" "text alignment: 0 left, 0.5 center, 1 right"
 seta hud_panel_centerprint_flip "" "invert messages order"
 seta hud_panel_centerprint_bold "" "make frag messages bold"
+seta hud_panel_centerprint_capitalize "" "make frag messages uppercase"
 seta hud_panel_centerprint_fontscale "" "scale the text font by this amount"
 seta hud_panel_centerprint_fontscale_bold "" "scale the text font of frag messages by this amount"
 seta hud_panel_centerprint_time "" "message duration (NOTE: certain messages have a fixed duration)"

diff --git a/hud_luma.cfg b/hud_luma.cfg
index 26cfcf7233ecf0e916c6073a25fab9e742b7b18a..b76c7b2f6c64a4520978f890e75ae15af765da2f 100644 (file)
--- a/hud_luma.cfg
+++ b/hud_luma.cfg
@@ -276,6 +276,7 @@ seta hud_panel_centerprint_bg_padding ""
 seta hud_panel_centerprint_align "0.5"
 seta hud_panel_centerprint_flip "0"
 seta hud_panel_centerprint_bold "1"
+seta hud_panel_centerprint_capitalize "1"
 seta hud_panel_centerprint_fontscale "1"
 seta hud_panel_centerprint_fontscale_bold "1.8"
 seta hud_panel_centerprint_time "3"

diff --git a/hud_luminos.cfg b/hud_luminos.cfg
index 1e1cb668810f669f85af6f3a960a743540dce402..6a966debb1cda52b8fc7e0659e724c605f118b59 100644 (file)
--- a/hud_luminos.cfg
+++ b/hud_luminos.cfg
@@ -276,6 +276,7 @@ seta hud_panel_centerprint_bg_padding ""
 seta hud_panel_centerprint_align "0.5"
 seta hud_panel_centerprint_flip "0"
 seta hud_panel_centerprint_bold "1"
+seta hud_panel_centerprint_capitalize "1"
 seta hud_panel_centerprint_fontscale "1"
 seta hud_panel_centerprint_fontscale_bold "1.8"
 seta hud_panel_centerprint_time "3"

diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg
index 50c837b07c62adb394036fc5d6f20d5f701559b5..c67769e0ba1a0d0c91c8e879adda4dc9f1dcade3 100644 (file)
--- a/hud_luminos_minimal.cfg
+++ b/hud_luminos_minimal.cfg
@@ -276,6 +276,7 @@ seta hud_panel_centerprint_bg_padding ""
 seta hud_panel_centerprint_align "0.5"
 seta hud_panel_centerprint_flip "0"
 seta hud_panel_centerprint_bold "1"
+seta hud_panel_centerprint_capitalize "1"
 seta hud_panel_centerprint_fontscale "1"
 seta hud_panel_centerprint_fontscale_bold "1.8"
 seta hud_panel_centerprint_time "3"

diff --git a/hud_luminos_minimal_xhair.cfg b/hud_luminos_minimal_xhair.cfg
index 2bfc5a80c917ba98ef4bd0645e3c26b63c809fab..a079da52ba021221b9adf8ddec81bc80d47ad462 100644 (file)
--- a/hud_luminos_minimal_xhair.cfg
+++ b/hud_luminos_minimal_xhair.cfg
@@ -276,6 +276,8 @@ seta hud_panel_centerprint_bg_padding ""
 seta hud_panel_centerprint_align "0.5"
 seta hud_panel_centerprint_flip "0"
 seta hud_panel_centerprint_bold "1"
+seta hud_panel_centerprint_capitalize "1"
+seta hud_panel_centerprint_capitalize "1"
 seta hud_panel_centerprint_fontscale "1"
 seta hud_panel_centerprint_fontscale_bold "1.8"
 seta hud_panel_centerprint_time "3"

diff --git a/hud_luminos_old.cfg b/hud_luminos_old.cfg
index e2ed8a4b1cab4e5d30aef6a2e8fa41ff32e8881a..8c09dc3e7024707a5cb4a789dc69816c2088bae6 100644 (file)
--- a/hud_luminos_old.cfg
+++ b/hud_luminos_old.cfg
@@ -276,6 +276,7 @@ seta hud_panel_centerprint_bg_padding ""
 seta hud_panel_centerprint_align "0.5"
 seta hud_panel_centerprint_flip "0"
 seta hud_panel_centerprint_bold "1"
+seta hud_panel_centerprint_capitalize "1"
 seta hud_panel_centerprint_fontscale "1"
 seta hud_panel_centerprint_fontscale_bold "1.8"
 seta hud_panel_centerprint_time "3"

diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg
index eb27a98c1f860000e4e11f4c6e9a32094e76ed6e..08df3444b8d56c4de52b5cd9104dea71e45ab99b 100644 (file)
--- a/hud_nexuiz.cfg
+++ b/hud_nexuiz.cfg
@@ -276,6 +276,7 @@ seta hud_panel_centerprint_bg_padding ""
 seta hud_panel_centerprint_align "0.5"
 seta hud_panel_centerprint_flip "0"
 seta hud_panel_centerprint_bold "1"
+seta hud_panel_centerprint_capitalize "1"
 seta hud_panel_centerprint_fontscale "1"
 seta hud_panel_centerprint_fontscale_bold "1.8"
 seta hud_panel_centerprint_time "3"

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 7c4802dadddc8e7ec7e9198d6b8f99cf6d65e5a7..29755bce54e7bc11530ce7be8c864fef6b02d7d9 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -243,6 +243,7 @@ float autocvar_hud_panel_centerprint_fade_subsequent_minfontsize = 0.75;
 float autocvar_hud_panel_centerprint_fade_minfontsize = 0;
 bool autocvar_hud_panel_centerprint_flip;
 bool autocvar_hud_panel_centerprint_bold;
+bool autocvar_hud_panel_centerprint_capitalize;
 float autocvar_hud_panel_centerprint_fontscale;
 float autocvar_hud_panel_centerprint_fontscale_bold;
 float autocvar_hud_panel_centerprint_time;

diff --git a/qcsrc/client/hud/hud_config.qc b/qcsrc/client/hud/hud_config.qc
index ed4e1b9352696ec43ce624e8bf012e08ad451b39..4428c4602641eb6d27602bedd8e5678a597f9570 100644 (file)
--- a/qcsrc/client/hud/hud_config.qc
+++ b/qcsrc/client/hud/hud_config.qc
@@ -194,6 +194,7 @@ void HUD_Panel_ExportCfg(string cfgname)
                                        HUD_Write_Cvar("hud_panel_centerprint_align");
                                        HUD_Write_Cvar("hud_panel_centerprint_flip");
                                        HUD_Write_Cvar("hud_panel_centerprint_bold");
+                                       HUD_Write_Cvar("hud_panel_centerprint_capitalize");
                                        HUD_Write_Cvar("hud_panel_centerprint_fontscale");
                                        HUD_Write_Cvar("hud_panel_centerprint_fontscale_bold");
                                        HUD_Write_Cvar("hud_panel_centerprint_time");

diff --git a/qcsrc/client/hud/panel/centerprint.qc b/qcsrc/client/hud/panel/centerprint.qc
index 4f99a27a44b8ab04da3980f52893b81af409c865..1627b227bde19319eae7268a7c7a93204fc10cdc 100644 (file)
--- a/qcsrc/client/hud/panel/centerprint.qc
+++ b/qcsrc/client/hud/panel/centerprint.qc
@@ -215,8 +215,16 @@ void HUD_CenterPrint ()
        {
                // if the notification starts with ^BOLD make it bold (e.g. frag messages)
                is_bold = (substring(centerprint_messages[j], 0, 5) == BOLD_OPERATOR);
-               // remove ^BOLD so it doesn't get printed onscreen
-               centerprint_message = is_bold ? strzone(substring(centerprint_messages[j], 5, -1)) : strzone(centerprint_messages[j]);
+               // remove ^BOLD so it doesn't get printed onscreen. also capitalize the text if hud_panel_centerprint_capitalize is true
+               if (is_bold) {
+                       if (autocvar_hud_panel_centerprint_capitalize) {
+                               centerprint_message = strzone(strtoupper(substring(centerprint_messages[j], 5, -1)));
+                       } else {
+                               centerprint_message = strzone(substring(centerprint_messages[j], 5, -1));
+                       }
+               } else {
+                       centerprint_message = strzone(centerprint_messages[j]);
+               }
 
                // entries = bound(1, floor(CENTERPRINT_MAX_ENTRIES * 4 * panel_size_y/panel_size_x), CENTERPRINT_MAX_ENTRIES);
                // height = panel_size_y/entries;

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc b/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc
index 559f86e851536cec69d4ebe9f02b6ba793f1ea21..d392bbb0c6141186b19a67dfbf5ac25736540716 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc
@@ -41,6 +41,9 @@ void XonoticHUDCenterprintDialog_fill(entity me)
        me.TR(me);
                me.TDempty(me, 0.2);
                me.TD(me, 1, 3.8, e = makeXonoticCheckBox(0, "hud_panel_centerprint_bold", _("Enable bold frag messages")));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 3.8, e = makeXonoticCheckBox(0, "hud_panel_centerprint_capitalize", _("Capitalize frag messages")));
        me.TR(me);
                me.TDempty(me, 0.2);
                me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Font scale:")));

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qh b/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qh
index 0d237d67e17c640fcd1ad4690cb58711d0b5c879..2efe08626e3a50ddb1ba030a843072e532557821 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qh
@@ -6,7 +6,7 @@ CLASS(XonoticHUDCenterprintDialog, XonoticRootDialog)
        ATTRIB(XonoticHUDCenterprintDialog, title, string, _("Centerprint Panel"));
        ATTRIB(XonoticHUDCenterprintDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
        ATTRIB(XonoticHUDCenterprintDialog, intendedWidth, float, 0.4);
-       ATTRIB(XonoticHUDCenterprintDialog, rows, float, 19);
+       ATTRIB(XonoticHUDCenterprintDialog, rows, float, 20);
        ATTRIB(XonoticHUDCenterprintDialog, columns, float, 4);
        ATTRIB(XonoticHUDCenterprintDialog, name, string, "HUDcenterprint");
        ATTRIB(XonoticHUDCenterprintDialog, requiresConnection, float, true);