edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-19 01:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8806 from bencie/allow-reloading

Browse source 
Allow reloading current background entities map
This commit is contained in:
Robert Müller 2024-08-26 15:04:59 +00:00 committed by GitHub
parent 6e3b0910e1 d8e82bbb1d
commit 028bd148f3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game/client/components/menus.cpp
View file

@ -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);

1
src/game/client/components/menus.h
View file

@ -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();

4
src/game/client/components/menus_settings.cpp
View file

@ -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;
}
}