Rename hud_panel_itemstime_showspawned to hud_panel_itemstime_hidespawned, and make...

diff --git a/_hud_common.cfg b/_hud_common.cfg
index ba81ef88ea520992f3db7e75a1c77ab3b28bf613..3430d0927fa3af910130046d56c99e03ec85c24b 100644 (file)
--- a/_hud_common.cfg
+++ b/_hud_common.cfg
@@ -42,6 +42,7 @@ seta hud_panel_physics_acceleration_movingaverage 1 "use an averaging method for
 seta hud_panel_phisics_update_interval 0.0666 "how often (in seconds) numeric values get updated on screen"
 
 seta hud_panel_itemstime_progressbar_maxtime "30" "when left time is at least this amount, the status bar is full"
+seta hud_panel_itemstime_hidespawned "0" "hide items once they respawn"
 
 // hud panel aliases
 alias hud_panel_radar_rotate "toggle hud_panel_radar_rotation 0 1 2 3 4"

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index 9c493e5c070757c9b345dfa48243346eceba7c55..585cdd8e52c53d2d947750c11ec2da62d92f58a9 100644 (file)
--- a/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@ -338,7 +338,6 @@ seta hud_panel_itemstime_iconalign "" "0 = align icons to the left, 1 = align ic
 seta hud_panel_itemstime_progressbar "" "use progressbar behind icons"
 seta hud_panel_itemstime_progressbar_name "" "name of progressbar to use behind icons"
 seta hud_panel_itemstime_progressbar_reduced "" "progressbar is displayed only in the text field"
-seta hud_panel_itemstime_showspawned "" "show icons of already spawned items"
 seta hud_panel_itemstime_text "" "show text"
 seta hud_panel_itemstime_ratio "" "ratio between space reserved for text and icon width of each item entry (min value is 2)"
 seta hud_panel_itemstime_dynamicsize "" "allow panel size reduction by removing spacing among items"

diff --git a/hud_luma.cfg b/hud_luma.cfg
index 7245c115637b98044abd077b38ab705ba94aba3e..de2f3d896b84d4b16b1359106a923c61d2d65034 100644 (file)
--- a/hud_luma.cfg
+++ b/hud_luma.cfg
@@ -336,7 +336,6 @@ seta hud_panel_itemstime_iconalign "0"
 seta hud_panel_itemstime_progressbar "0"
 seta hud_panel_itemstime_progressbar_name "progressbar"
 seta hud_panel_itemstime_progressbar_reduced "0"
-seta hud_panel_itemstime_showspawned "0"
 seta hud_panel_itemstime_text "1"
 seta hud_panel_itemstime_ratio "2"
 seta hud_panel_itemstime_dynamicsize "1"

diff --git a/hud_luminos.cfg b/hud_luminos.cfg
index e871cb1210f63d48a6b11284638ebf99cc95c092..2e0dccb64901f4aae71b5008cc4946c11cc7f818 100644 (file)
--- a/hud_luminos.cfg
+++ b/hud_luminos.cfg
@@ -336,7 +336,6 @@ seta hud_panel_itemstime_iconalign "0"
 seta hud_panel_itemstime_progressbar "0"
 seta hud_panel_itemstime_progressbar_name "progressbar"
 seta hud_panel_itemstime_progressbar_reduced "0"
-seta hud_panel_itemstime_showspawned "0"
 seta hud_panel_itemstime_text "1"
 seta hud_panel_itemstime_ratio "2"
 seta hud_panel_itemstime_dynamicsize "1"

diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg
index 2abba015efe39d570d25a727e00ed2ef3099a84d..71fdb1b3020b383811db42fb321b379c93201ce2 100644 (file)
--- a/hud_luminos_minimal.cfg
+++ b/hud_luminos_minimal.cfg
@@ -336,7 +336,6 @@ seta hud_panel_itemstime_iconalign "0"
 seta hud_panel_itemstime_progressbar "0"
 seta hud_panel_itemstime_progressbar_name "progressbar"
 seta hud_panel_itemstime_progressbar_reduced "0"
-seta hud_panel_itemstime_showspawned "0"
 seta hud_panel_itemstime_text "1"
 seta hud_panel_itemstime_ratio "2"
 seta hud_panel_itemstime_dynamicsize "1"

diff --git a/hud_luminos_minimal_xhair.cfg b/hud_luminos_minimal_xhair.cfg
index a8136594a1e369736e8101792d2019617045bdd6..d14f25be24eaaa69e737ddbde88d252d30d2434d 100644 (file)
--- a/hud_luminos_minimal_xhair.cfg
+++ b/hud_luminos_minimal_xhair.cfg
@@ -336,7 +336,6 @@ seta hud_panel_itemstime_iconalign "0"
 seta hud_panel_itemstime_progressbar "0"
 seta hud_panel_itemstime_progressbar_name "progressbar"
 seta hud_panel_itemstime_progressbar_reduced "0"
-seta hud_panel_itemstime_showspawned "0"
 seta hud_panel_itemstime_text "1"
 seta hud_panel_itemstime_ratio "2"
 seta hud_panel_itemstime_dynamicsize "1"

diff --git a/hud_luminos_old.cfg b/hud_luminos_old.cfg
index d60eb1c9b05527fa8cc9529012e7c2b901cbe8e2..220d9e7edf09fd3fa2d8e4b8c259d5b02e780f0f 100644 (file)
--- a/hud_luminos_old.cfg
+++ b/hud_luminos_old.cfg
@@ -336,7 +336,6 @@ seta hud_panel_itemstime_iconalign "0"
 seta hud_panel_itemstime_progressbar "1"
 seta hud_panel_itemstime_progressbar_name "progressbar"
 seta hud_panel_itemstime_progressbar_reduced "1"
-seta hud_panel_itemstime_showspawned "0"
 seta hud_panel_itemstime_text "1"
 seta hud_panel_itemstime_ratio "3.5"
 seta hud_panel_itemstime_dynamicsize "1"

diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg
index 0c12bbdb2cb95f2df7096959d08737704ae3f57b..3a3a4a125f16f64afbef84710f4efcf85d215ec6 100644 (file)
--- a/hud_nexuiz.cfg
+++ b/hud_nexuiz.cfg
@@ -336,7 +336,6 @@ seta hud_panel_itemstime_iconalign "0"
 seta hud_panel_itemstime_progressbar "0"
 seta hud_panel_itemstime_progressbar_name "progressbar"
 seta hud_panel_itemstime_progressbar_reduced "0"
-seta hud_panel_itemstime_showspawned "0"
 seta hud_panel_itemstime_text "1"
 seta hud_panel_itemstime_ratio "2"
 seta hud_panel_itemstime_dynamicsize "1"

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 60ebac0b18a6cd028ba85159712c90e5db923c7c..036bd914e681c64a3bf5b76906ee057355270ee3 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -277,7 +277,7 @@ bool autocvar_hud_panel_itemstime_progressbar = 0;
 float autocvar_hud_panel_itemstime_progressbar_maxtime;
 string autocvar_hud_panel_itemstime_progressbar_name = "progressbar";
 float autocvar_hud_panel_itemstime_progressbar_reduced;
-bool autocvar_hud_panel_itemstime_showspawned;
+bool autocvar_hud_panel_itemstime_hidespawned = 0;
 int autocvar_hud_panel_itemstime_text = 1;
 bool autocvar_hud_panel_infomessages;
 bool autocvar_hud_panel_infomessages_flip;

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index b86e9746058a02705239c077ea044aedb179f150..6357d614e94787ac3c3f0bc770a43fcef10cf8f1 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -4757,7 +4757,7 @@ void HUD_ItemsTime(void)
 
        float i;
        float count = 0;
-       if (autocvar_hud_panel_itemstime_showspawned)
+       if (!autocvar_hud_panel_itemstime_hidespawned)
                for (i = 0; i < ITEMSTIME_MAXITEMS; ++i)
                        count += (ItemsTime_time[i] != -1);
        else
@@ -4845,7 +4845,7 @@ void HUD_ItemsTime(void)
                }
                else
                        item_available = (item_time <= time);
-               if (!autocvar_hud_panel_itemstime_showspawned)
+               if(autocvar_hud_panel_itemstime_hidespawned)
                        if(item_available)
                                continue;
                DrawItemsTimeItem(pos + eX * column * (itemstime_size.x + offset.x) + eY * row * (itemstime_size.y + offset.y), itemstime_size, ar, i, item_time, item_available);

diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc
index d4330cda78aa5c3a3634da39ff79efbcb7ca58fb..6a2a37cb0e3d083a901718f38fdf2b6035c73677 100644 (file)
--- a/qcsrc/client/hud_config.qc
+++ b/qcsrc/client/hud_config.qc
@@ -209,7 +209,6 @@ void HUD_Panel_ExportCfg(string cfgname)
                                        HUD_Write_PanelCvar_q("_progressbar");
                                        HUD_Write_PanelCvar_q("_progressbar_name");
                                        HUD_Write_PanelCvar_q("_progressbar_reduced");
-                                       HUD_Write_PanelCvar_q("_showspawned");
                                        HUD_Write_PanelCvar_q("_text");
                                        HUD_Write_PanelCvar_q("_ratio");
                                        HUD_Write_PanelCvar_q("_dynamicsize");

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc b/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc
index cdafe29898aee76bc00e396e2126e8f3c4a88087..77f99dcc59babde5484ed353563daccf2a8e7435 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc
@@ -39,7 +39,7 @@ void XonoticHUDItemsTimeDialog_fill(entity me)
                me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, _("Text/icon ratio:")));
                me.TD(me, 1, 2.6, e = makeXonoticSlider(2, 8, 0.5, "hud_panel_itemstime_ratio"));
        me.TR(me);
-               me.TD(me, 1, 4, e = makeXonoticCheckBox(0, "hud_panel_itemstime_showspawned", _("Show spawned items")));
+               me.TD(me, 1, 4, e = makeXonoticCheckBox(0, "hud_panel_itemstime_hidespawned", _("Hide spawned items")));
        me.TR(me);
                me.TD(me, 1, 4, e = makeXonoticCheckBox(0, "hud_panel_itemstime_dynamicsize", _("Dynamic size")));
 }