Small cleanup

diff --git a/hud_luma.cfg b/hud_luma.cfg
index 3c3d0ee4be45bd2c71ca1acacf376c42b32b6de7..70260c34cb163294da6a7a5e0af1dc944e83130d 100644 (file)
--- a/hud_luma.cfg
+++ b/hud_luma.cfg
@@ -24,7 +24,7 @@ seta hud_progressbar_speed_color "0.77 0.67 0"
 seta hud_progressbar_acceleration_color "0.2 0.65 0.93"
 seta hud_progressbar_acceleration_neg_color "0.86 0.35 0"
 
-seta _hud_panelorder "15 12 9 5 10 6 14 0 7 4 11 2 1 3 8 13 16 "
+seta _hud_panelorder "15 12 9 5 10 6 14 0 7 4 11 2 1 3 8 13 16 17 "
 
 seta hud_configure_grid "1"
 seta hud_configure_grid_xsize "0.005000"

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 22f36ddedee72376166457cea1d6d35d856b936e..3ff3acdccd367edef6a52b261d387a37f8051337 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -4691,9 +4691,7 @@ void HUD_ItemsTime(void)
 
        float rows, columns;
        float ar = max(2, autocvar_hud_panel_itemstime_ratio) + 1;
-       rows = mySize_y/mySize_x;
-       rows = bound(1, floor((sqrt(4 * ar * rows * count + rows * rows) + rows + 0.5) / 2), count);
-
+       rows = HUD_GetRowCount(count, mySize, ar);
        columns = ceil(count/rows);
 
        vector itemstime_size;

diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
index 0718e8147df597dd9d94b8ccd3254e507d6ef5f9..54cf6f906d3c0038b2fe7458aa46f685c0645374 100644 (file)
--- a/qcsrc/client/hud.qh
+++ b/qcsrc/client/hud.qh
@@ -155,8 +155,9 @@ int prev_p_health, prev_p_armor;
        HUD_PANEL(INFOMESSAGES , HUD_InfoMessages , infomessages)                                                                                                               \
        HUD_PANEL(PHYSICS      , HUD_Physics      , physics)                                                                                                                    \
        HUD_PANEL(CENTERPRINT  , HUD_CenterPrint  , centerprint)                                                                                                                \
-       HUD_PANEL(BUFFS        , HUD_Buffs        , buffs)                                                                                                                              \
-       HUD_PANEL(ITEMSTIME    , HUD_ItemsTime    , itemstime)
+       HUD_PANEL(BUFFS        , HUD_Buffs        , buffs) \
+       HUD_PANEL(ITEMSTIME    , HUD_ItemsTime    , itemstime) \
+       // always add new panels to the end of list
 
 #define HUD_PANEL(NAME, draw_func, name)                                                                                                                                                       \
        int HUD_PANEL_##NAME;                                                                                                                                                                                   \