From cbf78aa26a3f9a725beef4d59fd3806232d39056 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Wed, 19 Apr 2023 13:36:27 -0700 Subject: [PATCH] Menu-FN: fix the player model preview frames showing up when they shouldn't. --- src/menu-fn/m_customize.qc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/menu-fn/m_customize.qc b/src/menu-fn/m_customize.qc index 79508aab..a7e5bd16 100644 --- a/src/menu-fn/m_customize.qc +++ b/src/menu-fn/m_customize.qc @@ -460,10 +460,6 @@ void menu_customize_draw(void) { - drawfill([g_menuofs[0] + 410,g_menuofs[1] + 160], [170, 221], FRAME_COLOR, 1.0f); - drawfill([g_menuofs[0] + 413,g_menuofs[1] + 163], [164,190], [0,0,0], 1.0f); - - Widget_Draw(fn_customize); Header_Draw(HEAD_CUSTOMIZE); WLabel_Static(212, 140, m_reslbl[IDS_PLAYERINFO_NAME], 14, 14, [1,1,1], 1.0f, 0, font_label); @@ -488,10 +484,12 @@ menu_customize_draw(void) 1.0f, 0, font_label); - WLabel_Static(410, 390, "Colors", 14, 14, [1,1,1], - 1.0f, 0, font_label); if (games[gameinfo_current].nomodels == 0) { + drawfill([g_menuofs[0] + 410,g_menuofs[1] + 160], [170, 221], FRAME_COLOR, 1.0f); + drawfill([g_menuofs[0] + 413,g_menuofs[1] + 163], [164,190], [0,0,0], 1.0f); + WLabel_Static(410, 390, "Colors", 14, 14, [1,1,1], + 1.0f, 0, font_label); WLabel_Static(410, 140, sprintf(m_reslbl[IDS_MODEL_NAME], cvar_string("_cl_playermodel")), 14, 14, [1,1,1], 1.0f, 0, font_arial); #ifdef MODEL_PREVIEW @@ -509,6 +507,8 @@ menu_customize_draw(void) #endif } + Widget_Draw(fn_customize); + #ifdef MODEL_PREVIEW if (g_iPreviewmodelSubUpdate == 0) { cz_cxHQModelsChanged(cvar("cl_himodels"));