From f70970407fbd3890ffeaf80324b939244ca196a5 Mon Sep 17 00:00:00 2001 From: Freddy Date: Sun, 6 Nov 2016 00:01:12 +0100 Subject: [PATCH] Rename hud_panel_itemstime_hidelarge to hud_panel_itemstime_hidebig --- _hud_common.cfg | 2 +- qcsrc/common/mutators/mutator/itemstime/itemstime.qc | 10 +++++----- qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/_hud_common.cfg b/_hud_common.cfg index c7befdd23..f01f51de8 100644 --- a/_hud_common.cfg +++ b/_hud_common.cfg @@ -97,7 +97,7 @@ seta hud_panel_physics_speed_unit "1" "speed unit (1 = qu/s, 2 = m/s, 3 = km/h, 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 "1" "if 1 hide an item from the panel when all the occurrences of it are available again; if 2 hide it when at least one occurrence is available again" -seta hud_panel_itemstime_hidelarge "0" "if 1 hide large armor and health from the panel" +seta hud_panel_itemstime_hidebig "0" "if 1 hide big armor and health from the panel" seta hud_panel_quickmenu_file "" "load the quick menu from this file (empty or 0 to disable)" seta hud_panel_quickmenu_translatecommands 0 "when the game is translated, translate strings inside commands too (useful for chat commands)" diff --git a/qcsrc/common/mutators/mutator/itemstime/itemstime.qc b/qcsrc/common/mutators/mutator/itemstime/itemstime.qc index bbc48d7d8..3db867a5b 100644 --- a/qcsrc/common/mutators/mutator/itemstime/itemstime.qc +++ b/qcsrc/common/mutators/mutator/itemstime/itemstime.qc @@ -49,18 +49,18 @@ float autocvar_hud_panel_itemstime_progressbar_maxtime = 30; string autocvar_hud_panel_itemstime_progressbar_name = "progressbar"; float autocvar_hud_panel_itemstime_progressbar_reduced; bool autocvar_hud_panel_itemstime_hidespawned = 1; -bool autocvar_hud_panel_itemstime_hidelarge = false; +bool autocvar_hud_panel_itemstime_hidebig = false; int autocvar_hud_panel_itemstime_text = 1; -#define hud_panel_itemstime_hidelarge autocvar_hud_panel_itemstime_hidelarge +#define hud_panel_itemstime_hidebig autocvar_hud_panel_itemstime_hidebig #else -#define hud_panel_itemstime_hidelarge false +#define hud_panel_itemstime_hidebig false #endif bool Item_ItemsTime_SpectatorOnly(GameItem it) { return (false - || it == ITEM_ArmorMega || (it == ITEM_ArmorBig && !hud_panel_itemstime_hidelarge) - || it == ITEM_HealthMega || (it == ITEM_HealthBig && !hud_panel_itemstime_hidelarge) + || it == ITEM_ArmorMega || (it == ITEM_ArmorBig && !hud_panel_itemstime_hidebig) + || it == ITEM_HealthMega || (it == ITEM_HealthBig && !hud_panel_itemstime_hidebig) ); } diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc b/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc index f06038377..aeb8c8c77 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc @@ -34,7 +34,7 @@ void XonoticHUDItemsTimeDialog_fill(entity me) me.TR(me); 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_hidelarge", _("Hide large armor and health"))); + me.TD(me, 1, 4, e = makeXonoticCheckBox(0, "hud_panel_itemstime_hidebig", _("Hide big armor and health"))); me.TR(me); me.TD(me, 1, 4, e = makeXonoticCheckBox(0, "hud_panel_itemstime_dynamicsize", _("Dynamic size"))); } -- 2.39.2