Add hud_panel_ammo_noncurrent_scale cvar

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index ae1908fa3eefc961f1f97bbee309325f16dcc86e..7d8b0ccf9f02356814b2fb14e3431f8c96dce665 100644 (file)
--- a/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@ -67,6 +67,7 @@ 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_noncurrent_scale "" "scale of noncurrent ammo types, relative to the current ammo type"
 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 bad9709c1eb1240480458dd5b18cbc9a36a9aec9..a37447783d6009448e095c0bfc26a9d894aae7fe 100644 (file)
--- a/hud_luminos.cfg
+++ b/hud_luminos.cfg
@@ -71,6 +71,7 @@ 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_noncurrent_scale "1"
 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 6008152d26ac54c0c12b6d268960c22a4bc82a08..3128aff4f15c84140e961f7976c3d47e182a18f1 100644 (file)
--- a/hud_luminos_minimal.cfg
+++ b/hud_luminos_minimal.cfg
@@ -71,6 +71,7 @@ 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_noncurrent_scale "1"
 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 de18c4556bdea7f1852f3544380a72b948a0281f..0f424c6f06547e643c6b26f629321f00b00d6553 100644 (file)
--- a/hud_luminos_minimal_xhair.cfg
+++ b/hud_luminos_minimal_xhair.cfg
@@ -71,6 +71,7 @@ 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_noncurrent_scale "1"
 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 c6202d7ec58703f9be1eca7306be0f90c986f7aa..3ee6b927758b0c567ce856a0fb3019f580bc00b8 100644 (file)
--- a/hud_luminos_old.cfg
+++ b/hud_luminos_old.cfg
@@ -71,6 +71,7 @@ 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_noncurrent_scale "1"
 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 a5c6cfc3eaada9c88fbb1184a0cc3a29c82425e2..c4aebab73900a22d3bd034984dbd58659cdc5d47 100644 (file)
--- a/hud_nexuiz.cfg
+++ b/hud_nexuiz.cfg
@@ -71,6 +71,7 @@ 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_noncurrent_scale "1"
 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 e6655bf2161070bb95c4f22917c761e968847f83..8215b9faf2aeddfe7057eede883513cbc258a4c7 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -222,6 +222,7 @@ 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_noncurrent_scale = 1;
 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 37d105a5e54fc63882d6a430e9806c938761c911..c15f1c47ee962feb506b110f628c79ae75df472e 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -895,6 +895,13 @@ void DrawAmmoItem(vector myPos, vector mySize, .float ammoType, float isCurrent,
        else
                ammo = getstati(GetAmmoStat(ammoType));
 
+       if(!isCurrent)
+       {
+               float scale = bound(0, autocvar_hud_panel_ammo_noncurrent_scale, 1);
+               myPos = myPos + (mySize - mySize * scale) * 0.5;
+               mySize = mySize * scale;
+       }
+
        vector iconPos, textPos;
        if(autocvar_hud_panel_ammo_iconalign)
        {

diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc
index 1d230a1b43d6cfbfda686f0020b2dc84f2e651cf..78f16f88db99f7b851edc2c426cb6d960527ccee 100644 (file)
--- a/qcsrc/client/hud_config.qc
+++ b/qcsrc/client/hud_config.qc
@@ -89,6 +89,7 @@ void HUD_Panel_ExportCfg(string cfgname)
                                case HUD_PANEL_AMMO:
                                        HUD_Write_PanelCvar_q("_onlycurrent");
                                        HUD_Write_PanelCvar_q("_noncurrent_alpha");
+                                       HUD_Write_PanelCvar_q("_noncurrent_scale");
                                        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 5544ffdefbb8231c204d0fca8e2d30bd7cd86cf3..15095b2baed2e320a55b5b4c89bdd325142f601d 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.2, e = makeXonoticTextLabel(0, _("Alpha noncurrent:")));
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Noncurrent alpha:")));
                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, _("Noncurrent scale:")));
+               me.TD(me, 1, 2.6, e = makeXonoticSlider(0, 1, 0.1, "hud_panel_ammo_noncurrent_scale"));
        me.TR(me);
                me.TDempty(me, 0.2);
                me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Align icon:")));