From 578dbe7473aa6fe64a33c9c711a4d240b0212786 Mon Sep 17 00:00:00 2001 From: Severin Meyer Date: Mon, 19 Jan 2015 00:23:35 +0100 Subject: [PATCH] Add hud_panel_ammo_noncurrent_alpha cvar --- _hud_descriptions.cfg | 1 + hud_luminos.cfg | 1 + hud_luminos_minimal.cfg | 1 + hud_luminos_minimal_xhair.cfg | 1 + hud_luminos_old.cfg | 1 + hud_nexuiz.cfg | 1 + qcsrc/client/autocvars.qh | 1 + qcsrc/client/hud.qc | 4 ++-- qcsrc/client/hud_config.qc | 1 + qcsrc/menu/xonotic/dialog_hudpanel_ammo.c | 10 +++++++--- 10 files changed, 17 insertions(+), 5 deletions(-) diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg index 270bd2bd9..ae1908fa3 100644 --- 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 f3bc914e6..bad9709c1 100644 --- 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 050689b38..6008152d2 100644 --- 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 8fb6cbe93..de18c4556 100644 --- 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 9d71e2e28..c6202d7ec 100644 --- 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 9e4678293..a5c6cfc3e 100644 --- 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 f06c5bfb3..e6655bf21 100644 --- 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 c668e5666..37d105a5e 100644 --- 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 047e012ad..1d230a1b4 100644 --- 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 3c89d0a03..5544ffdef 100644 --- 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 -- 2.39.2