Make bold frag messages optional

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index 3f0355b5fd79cae5ecf2db48b96a386d38e4a36d..ffaaeeef53c0f58ffce7780a20963a2be8167847 100644 (file)
--- a/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@ -274,6 +274,7 @@ seta hud_panel_centerprint_bg_border "" "if set to something else than \"\" = ov
 seta hud_panel_centerprint_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 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 have a special bold font and an increased font size"
 seta hud_panel_centerprint_fontscale "" "scale the text font by this amount"
 seta hud_panel_centerprint_fontscale_bold "" "scale the bold text font 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 7b83618169ce12dc6176bf97f9ecfdc14ea177e7..26cfcf7233ecf0e916c6073a25fab9e742b7b18a 100644 (file)
--- a/hud_luma.cfg
+++ b/hud_luma.cfg
@@ -275,6 +275,7 @@ seta hud_panel_centerprint_bg_border ""
 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_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 a7e95f56f32ea1909493a71f5416c8b262e5ed36..1e1cb668810f669f85af6f3a960a743540dce402 100644 (file)
--- a/hud_luminos.cfg
+++ b/hud_luminos.cfg
@@ -275,6 +275,7 @@ seta hud_panel_centerprint_bg_border ""
 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_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 646b149d6ca8773132503d938b87323917eb983d..50c837b07c62adb394036fc5d6f20d5f701559b5 100644 (file)
--- a/hud_luminos_minimal.cfg
+++ b/hud_luminos_minimal.cfg
@@ -275,6 +275,7 @@ seta hud_panel_centerprint_bg_border ""
 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_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 f8716369d3b9541d295f4d2051743d1aa6d2891e..2bfc5a80c917ba98ef4bd0645e3c26b63c809fab 100644 (file)
--- a/hud_luminos_minimal_xhair.cfg
+++ b/hud_luminos_minimal_xhair.cfg
@@ -275,6 +275,7 @@ seta hud_panel_centerprint_bg_border ""
 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_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 16b498a75a059d31b6720e803e5441dfa8b9014e..e2ed8a4b1cab4e5d30aef6a2e8fa41ff32e8881a 100644 (file)
--- a/hud_luminos_old.cfg
+++ b/hud_luminos_old.cfg
@@ -275,6 +275,7 @@ seta hud_panel_centerprint_bg_border ""
 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_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 0e0f079e8e25d214aa6553a8b7589dc3b3eb1854..eb27a98c1f860000e4e11f4c6e9a32094e76ed6e 100644 (file)
--- a/hud_nexuiz.cfg
+++ b/hud_nexuiz.cfg
@@ -275,6 +275,7 @@ seta hud_panel_centerprint_bg_border ""
 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_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 d125ae8a69aab4a2ec745e86a97f54283913a4a8..7c4802dadddc8e7ec7e9198d6b8f99cf6d65e5a7 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -242,6 +242,7 @@ float autocvar_hud_panel_centerprint_fade_subsequent_passtwo_minalpha = 0.5;
 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;
 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 4b5963cc47f042f7741c6dc42e0c71970fcc3dd6..ed4e1b9352696ec43ce624e8bf012e08ad451b39 100644 (file)
--- a/qcsrc/client/hud/hud_config.qc
+++ b/qcsrc/client/hud/hud_config.qc
@@ -193,6 +193,7 @@ void HUD_Panel_ExportCfg(string cfgname)
                                case HUD_PANEL_CENTERPRINT:
                                        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_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 5d47ed85a06ade00a35caa5770d7ab4cbd0ef71d..de81f64254f4f75b010adabefcf3470e938393ea 100644 (file)
--- a/qcsrc/client/hud/panel/centerprint.qc
+++ b/qcsrc/client/hud/panel/centerprint.qc
@@ -213,8 +213,8 @@ void HUD_CenterPrint ()
        align = bound(0, autocvar_hud_panel_centerprint_align, 1);
        for (g=0, i=0, j=cpm_index; i<CENTERPRINT_MAX_MSGS; ++i, ++j)
        {
-               // if the notification starts with ^BOLD make it bold (e.g. frag messages);
-               is_bold = (substring(centerprint_messages[j], 0, 5) == BOLD_OPERATOR);
+               // if the notification starts with ^BOLD make it bold (e.g. frag messages), but only if hud_panel_centerprint_bold is true
+               is_bold = (autocvar_hud_panel_centerprint_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]);
 

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc b/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc
index 938f69a8c57be823a7d95857e70101d37569c2c2..1a6f211ca8f41ffe71f8faf10dd8a2d13b9aafa0 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc
@@ -36,4 +36,11 @@ void XonoticHUDCenterprintDialog_fill(entity me)
                me.TDempty(me, 0.2);
                me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Font scale:")));
                me.TD(me, 1, 2.6, e = makeXonoticSlider(0.5, 2, 0.1, "hud_panel_centerprint_fontscale"));
+       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, 1.2, e = makeXonoticTextLabel(0, _("Bold font scale:")));
+               me.TD(me, 1, 2.6, e = makeXonoticSlider(0.5, 2, 0.1, "hud_panel_centerprint_fontscale_bold"));
 }

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qh b/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qh
index 2b952580ecb6e055ae51a1b6bd219d091f73d5de..9cc53d3109637902e6b02f649c2c482bcb018323 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, 15.5);
+       ATTRIB(XonoticHUDCenterprintDialog, rows, float, 17.5);
        ATTRIB(XonoticHUDCenterprintDialog, columns, float, 4);
        ATTRIB(XonoticHUDCenterprintDialog, name, string, "HUDcenterprint");
        ATTRIB(XonoticHUDCenterprintDialog, requiresConnection, float, true);