Commit 2d2b01a6 authored by terencehill's avatar terencehill

Rename hud_panel_itemstime_showspawned to hud_panel_itemstime_hidespawned, and make it an user cvar

parent 507d2309
......@@ -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"
......
......@@ -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"
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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;
......
......@@ -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);
......
......@@ -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");
......
......@@ -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")));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment