diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp index ffa5e35f4..9acaaad03 100644 --- a/src/game/client/components/menus.cpp +++ b/src/game/client/components/menus.cpp @@ -902,16 +902,11 @@ void CMenus::ConchainBackgroundEntities(IConsole::IResult *pResult, void *pUserD if(pResult->NumArguments()) { CMenus *pSelf = (CMenus *)pUserData; - pSelf->UpdateBackgroundEntities(); + if(str_comp(g_Config.m_ClBackgroundEntities, pSelf->m_pClient->m_Background.MapName()) != 0) + pSelf->m_pClient->m_Background.LoadBackground(); } } -void CMenus::UpdateBackgroundEntities() -{ - if(str_comp(g_Config.m_ClBackgroundEntities, m_pClient->m_Background.MapName()) != 0) - m_pClient->m_Background.LoadBackground(); -} - void CMenus::ConchainUpdateMusicState(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData) { pfnCallback(pResult, pCallbackUserData); diff --git a/src/game/client/components/menus.h b/src/game/client/components/menus.h index 6fae3606e..d0e08c2d6 100644 --- a/src/game/client/components/menus.h +++ b/src/game/client/components/menus.h @@ -445,7 +445,6 @@ protected: void RenderMenubar(CUIRect Box, IClient::EClientState ClientState); void RenderNews(CUIRect MainView); static void ConchainBackgroundEntities(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData); - void UpdateBackgroundEntities(); static void ConchainUpdateMusicState(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData); void UpdateMusicState(); diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index 3259f0ff1..97e9c685a 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -3229,7 +3229,7 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView) if(DoButton_FontIcon(&s_BackgroundEntitiesReload, FONT_ICON_ARROW_ROTATE_RIGHT, 0, &ReloadButton)) { - UpdateBackgroundEntities(); + m_pClient->m_Background.LoadBackground(); } if(DoButton_FontIcon(&s_BackgroundEntitiesMapPicker, FONT_ICON_FOLDER, 0, &Button)) @@ -3402,7 +3402,7 @@ CUi::EPopupMenuFunctionResult CMenus::PopupMapPicker(void *pContext, CUIRect Vie else { str_format(g_Config.m_ClBackgroundEntities, sizeof(g_Config.m_ClBackgroundEntities), "%s/%s", pPopupContext->m_aCurrentMapFolder, SelectedItem.m_aFilename); - pMenus->UpdateBackgroundEntities(); + pMenus->m_pClient->m_Background.LoadBackground(); return CUi::POPUP_CLOSE_CURRENT; } }