From 3f5114f04cb9b2361da824a6e7101e91a0dd6404 Mon Sep 17 00:00:00 2001 From: terencehill Date: Mon, 19 Jan 2015 18:09:50 +0100 Subject: [PATCH] Add quickmenu panel number to _hud_panelorder --- hud_luminos.cfg | 2 +- hud_luminos_minimal.cfg | 2 +- hud_luminos_minimal_xhair.cfg | 2 +- hud_luminos_old.cfg | 2 +- hud_nexuiz.cfg | 2 +- qcsrc/client/hud.qc | 4 ++-- qcsrc/client/hud.qh | 3 ++- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/hud_luminos.cfg b/hud_luminos.cfg index 837d534e6..377b737e7 100644 --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@ -24,7 +24,7 @@ seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" -seta _hud_panelorder "15 12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 16 17 " +seta _hud_panelorder "18 15 12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 16 17 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.010000" diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg index d57e50ddc..79b72fac9 100644 --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@ -24,7 +24,7 @@ seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" -seta _hud_panelorder "10 3 0 14 6 9 13 4 1 2 11 12 7 5 8 15 16 17 " +seta _hud_panelorder "18 10 3 0 14 6 9 13 4 1 2 11 12 7 5 8 15 16 17 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.010000" diff --git a/hud_luminos_minimal_xhair.cfg b/hud_luminos_minimal_xhair.cfg index d0d506c35..1185f2183 100644 --- a/hud_luminos_minimal_xhair.cfg +++ b/hud_luminos_minimal_xhair.cfg @@ -24,7 +24,7 @@ seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" -seta _hud_panelorder "15 3 1 2 11 10 0 14 6 9 13 4 12 7 5 8 16 17 " +seta _hud_panelorder "18 15 3 1 2 11 10 0 14 6 9 13 4 12 7 5 8 16 17 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.010000" diff --git a/hud_luminos_old.cfg b/hud_luminos_old.cfg index ed1a11e2f..c0edcb8b8 100644 --- a/hud_luminos_old.cfg +++ b/hud_luminos_old.cfg @@ -24,7 +24,7 @@ seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" -seta _hud_panelorder "15 10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 16 17 " +seta _hud_panelorder "18 15 10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 16 17 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.010000" diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg index 9d9c94ea7..523b3bf0a 100644 --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@ -24,7 +24,7 @@ seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" -seta _hud_panelorder "15 0 11 8 5 6 14 9 13 7 2 3 1 10 12 4 16 17 " +seta _hud_panelorder "18 15 0 11 8 5 6 14 9 13 7 2 3 1 10 12 4 16 17 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.01" diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index e5aea3780..f9333d411 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -4411,7 +4411,7 @@ void HUD_CenterPrint (void) } } -// Buffs (#18) +// Buffs (#17) // void HUD_Buffs(void) { @@ -4470,7 +4470,7 @@ void HUD_Buffs(void) draw_endBoldFont(); } -// QuickMenu (#19) +// QuickMenu (#18) // // QUICKMENU_MAXLINES must be <= 10 #define QUICKMENU_MAXLINES 10 diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh index f733e2968..992bdad40 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -119,7 +119,8 @@ float mv_active; HUD_PANEL(PHYSICS , HUD_Physics , physics) \ HUD_PANEL(CENTERPRINT , HUD_CenterPrint , centerprint) \ HUD_PANEL(BUFFS , HUD_Buffs , buffs) \ - HUD_PANEL(QUICKMENU , HUD_QuickMenu , quickmenu) + HUD_PANEL(QUICKMENU , HUD_QuickMenu , quickmenu) \ + // always add new panels to the end of list #define HUD_PANEL(NAME,draw_func,name) \ float HUD_PANEL_##NAME; \ -- 2.39.2