Add hud_panel_ammo_noncurrent_alpha cvar

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index 270bd2bd9294693bcbf787666f7b3b2d341e2141..ae1908fa3eefc961f1f97bbee309325f16dcc86e 100644 (file)
--- a/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@ -66,6 +66,7 @@ seta hud_panel_ammo "" "enable/disable this panel"
 seta hud_panel_ammo_pos "" "position of this panel"
 seta hud_panel_ammo_size "" "size of this panel"
 seta hud_panel_ammo_onlycurrent "" "1 = show only current ammo type"
+seta hud_panel_ammo_noncurrent_alpha "" "alpha of noncurrent ammo types"
 seta hud_panel_ammo_iconalign "" "0 = align icons to the left, 1 = align icons to the right"
 seta hud_panel_ammo_bg "" "if set to something else than \"\" = override default background"
 seta hud_panel_ammo_bg_color "" "if set to something else than \"\" = override default panel background color"

diff --git a/hud_luminos.cfg b/hud_luminos.cfg
index f3bc914e6a48be696bd9e3b8879eb90d9ab0254f..bad9709c1eb1240480458dd5b18cbc9a36a9aec9 100644 (file)
--- a/hud_luminos.cfg
+++ b/hud_luminos.cfg
@@ -70,6 +70,7 @@ seta hud_panel_ammo_bg_alpha ""
 seta hud_panel_ammo_bg_border ""
 seta hud_panel_ammo_bg_padding ""
 seta hud_panel_ammo_onlycurrent "0"
+seta hud_panel_ammo_noncurrent_alpha "0.7"
 seta hud_panel_ammo_iconalign "0"
 seta hud_panel_ammo_progressbar "0"
 seta hud_panel_ammo_progressbar_name "progressbar"

diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg
index 050689b38caf95d525f07e83f378649fc49dafff..6008152d26ac54c0c12b6d268960c22a4bc82a08 100644 (file)
--- a/hud_luminos_minimal.cfg
+++ b/hud_luminos_minimal.cfg
@@ -70,6 +70,7 @@ seta hud_panel_ammo_bg_alpha ""
 seta hud_panel_ammo_bg_border ""
 seta hud_panel_ammo_bg_padding ""
 seta hud_panel_ammo_onlycurrent "0"
+seta hud_panel_ammo_noncurrent_alpha "0.7"
 seta hud_panel_ammo_iconalign "0"
 seta hud_panel_ammo_progressbar "0"
 seta hud_panel_ammo_progressbar_name "progressbar"

diff --git a/hud_luminos_minimal_xhair.cfg b/hud_luminos_minimal_xhair.cfg
index 8fb6cbe93da88fd67f099c634126551449435fdf..de18c4556bdea7f1852f3544380a72b948a0281f 100644 (file)
--- a/hud_luminos_minimal_xhair.cfg
+++ b/hud_luminos_minimal_xhair.cfg
@@ -70,6 +70,7 @@ seta hud_panel_ammo_bg_alpha ""
 seta hud_panel_ammo_bg_border ""
 seta hud_panel_ammo_bg_padding ""
 seta hud_panel_ammo_onlycurrent "1"
+seta hud_panel_ammo_noncurrent_alpha "0.7"
 seta hud_panel_ammo_iconalign "0"
 seta hud_panel_ammo_progressbar "1"
 seta hud_panel_ammo_progressbar_name "progressbar_ammo"

diff --git a/hud_luminos_old.cfg b/hud_luminos_old.cfg
index 9d71e2e2872cc4f4d6e0624a2d2b5e74064fa5cf..c6202d7ec58703f9be1eca7306be0f90c986f7aa 100644 (file)
--- a/hud_luminos_old.cfg
+++ b/hud_luminos_old.cfg
@@ -70,6 +70,7 @@ seta hud_panel_ammo_bg_alpha ""
 seta hud_panel_ammo_bg_border ""
 seta hud_panel_ammo_bg_padding ""
 seta hud_panel_ammo_onlycurrent "0"
+seta hud_panel_ammo_noncurrent_alpha "0.7"
 seta hud_panel_ammo_iconalign "0"
 seta hud_panel_ammo_progressbar "0"
 seta hud_panel_ammo_progressbar_name "progressbar"

diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg
index 9e4678293d627419612564b5d12d91a4365d56fc..a5c6cfc3eaada9c88fbb1184a0cc3a29c82425e2 100644 (file)
--- a/hud_nexuiz.cfg
+++ b/hud_nexuiz.cfg
@@ -70,6 +70,7 @@ seta hud_panel_ammo_bg_alpha ""
 seta hud_panel_ammo_bg_border ""
 seta hud_panel_ammo_bg_padding ""
 seta hud_panel_ammo_onlycurrent "0"
+seta hud_panel_ammo_noncurrent_alpha "0.7"
 seta hud_panel_ammo_iconalign "0"
 seta hud_panel_ammo_progressbar "0"
 seta hud_panel_ammo_progressbar_name "progressbar"

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index f06c5bfb3bd0f66e6dbc25ad67f201587b50a7c0..e6655bf2161070bb95c4f22917c761e968847f83 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -221,6 +221,7 @@ float autocvar_hud_panel_ammo;
 float autocvar_hud_panel_ammo_iconalign;
 float autocvar_hud_panel_ammo_maxammo;
 float autocvar_hud_panel_ammo_onlycurrent;
+float autocvar_hud_panel_ammo_noncurrent_alpha = 0.7;
 float autocvar_hud_panel_ammo_progressbar;
 string autocvar_hud_panel_ammo_progressbar_name;
 float autocvar_hud_panel_ammo_progressbar_xoffset;

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index c668e5666377b44dbb25981edd35e0e04dcd1a45..37d105a5e54fc63882d6a430e9806c938761c911 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -924,9 +924,9 @@ void DrawAmmoItem(vector myPos, vector mySize, .float ammoType, float isCurrent,
        if(isCurrent)
                alpha = panel_fg_alpha;
        else if(isShadowed)
-               alpha = panel_fg_alpha * 0.7 * 0.5;
+               alpha = panel_fg_alpha * bound(0, autocvar_hud_panel_ammo_noncurrent_alpha, 1) * 0.5;
        else
-               alpha = panel_fg_alpha * 0.7;
+               alpha = panel_fg_alpha * bound(0, autocvar_hud_panel_ammo_noncurrent_alpha, 1);
 
        // Draw item
 

diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc
index 047e012ad65d8670b5502679f1bff01f72cce9c7..1d230a1b43d6cfbfda686f0020b2dc84f2e651cf 100644 (file)
--- a/qcsrc/client/hud_config.qc
+++ b/qcsrc/client/hud_config.qc
@@ -88,6 +88,7 @@ void HUD_Panel_ExportCfg(string cfgname)
                                        break;
                                case HUD_PANEL_AMMO:
                                        HUD_Write_PanelCvar_q("_onlycurrent");
+                                       HUD_Write_PanelCvar_q("_noncurrent_alpha");
                                        HUD_Write_PanelCvar_q("_iconalign");
                                        HUD_Write_PanelCvar_q("_progressbar");
                                        HUD_Write_PanelCvar_q("_progressbar_name");

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_ammo.c b/qcsrc/menu/xonotic/dialog_hudpanel_ammo.c
index 3c89d0a03ba08c63b1162fe79f422b65ac89a381..5544ffdefbb8231c204d0fca8e2d30bd7cd86cf3 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_ammo.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_ammo.c
@@ -26,8 +26,12 @@ void XonoticHUDAmmoDialog_fill(entity me)
                me.TD(me, 1, 3.8, e = makeXonoticCheckBox(0, "hud_panel_ammo_onlycurrent", _("Show only current ammo type")));
        me.TR(me);
                me.TDempty(me, 0.2);
-               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, _("Align icon:")));
-                       me.TD(me, 1, 2.4/2, e = makeXonoticRadioButton(2, "hud_panel_ammo_iconalign", "0", _("Left")));
-                       me.TD(me, 1, 2.4/2, e = makeXonoticRadioButton(2, "hud_panel_ammo_iconalign", "1", _("Right")));
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Alpha noncurrent:")));
+               me.TD(me, 1, 2.6, e = makeXonoticSlider(0, 1, 0.1, "hud_panel_ammo_noncurrent_alpha"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Align icon:")));
+                       me.TD(me, 1, 2.6/2, e = makeXonoticRadioButton(2, "hud_panel_ammo_iconalign", "0", _("Left")));
+                       me.TD(me, 1, 2.6/2, e = makeXonoticRadioButton(2, "hud_panel_ammo_iconalign", "1", _("Right")));
 }
 #endif