From: terencehill Date: Mon, 19 Dec 2011 23:25:08 +0000 (+0100) Subject: Correct cvar name X-Git-Tag: xonotic-v0.8.1~12^2~61 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5875355e9375aee2f1264a797708eee769cd2289;p=xonotic%2Fxonotic-data.pk3dir.git Correct cvar name --- diff --git a/_hud_common.cfg b/_hud_common.cfg index 8266694f2..7ecdf4cd2 100644 --- a/_hud_common.cfg +++ b/_hud_common.cfg @@ -26,7 +26,7 @@ seta hud_panel_engineinfo_framecounter_exponentialmovingaverage 1 "use an averag seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point" seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "threshold for fps change when to update instantly, to make big fps changes update faster" -seta hud_panel_itemstime_maxtime "30" "when left time is at least this amount, the status bar is full" +seta hud_panel_itemstime_progressbar_maxtime "30" "when left time is at least this amount, the status bar is full" // hud panel aliases alias hud_panel_radar_rotate "toggle hud_panel_radar_rotation 0 1 2 3 4" diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index 602fb863c..342aafdd3 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -244,8 +244,8 @@ float autocvar_hud_panel_infomessages; float autocvar_hud_panel_infomessages_flip; float autocvar_hud_panel_itemstime; float autocvar_hud_panel_itemstime_iconalign; -float autocvar_hud_panel_itemstime_maxitemstime; float autocvar_hud_panel_itemstime_progressbar; +float autocvar_hud_panel_itemstime_progressbar_maxtime; string autocvar_hud_panel_itemstime_progressbar_name; float autocvar_hud_panel_itemstime_progressbar_xoffset; float autocvar_hud_panel_itemstime_showspawned; diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index aa857db1b..c7fb2fc23 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -4837,7 +4837,7 @@ void DrawItemsTimeItem(vector myPos, vector mySize, float itemcode) } if(t > 0 && autocvar_hud_panel_itemstime_progressbar) - HUD_Panel_DrawProgressBar(myPos + eX * autocvar_hud_panel_itemstime_progressbar_xoffset * mySize_x, mySize - eX * autocvar_hud_panel_itemstime_progressbar_xoffset * mySize_x, autocvar_hud_panel_itemstime_progressbar_name, t/autocvar_hud_panel_itemstime_maxitemstime, 0, 0, color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); + HUD_Panel_DrawProgressBar(myPos + eX * autocvar_hud_panel_itemstime_progressbar_xoffset * mySize_x, mySize - eX * autocvar_hud_panel_itemstime_progressbar_xoffset * mySize_x, autocvar_hud_panel_itemstime_progressbar_name, t/autocvar_hud_panel_itemstime_progressbar_maxtime, 0, 0, color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL); if(t > 0 && autocvar_hud_panel_itemstime_text) drawstring_aspect(numpos, ftos(t), eX * (2/3) * mySize_x + eY * mySize_y, color, panel_fg_alpha, DRAWFLAG_NORMAL);