mirror of
https://github.com/ddnet/ddnet.git
synced 2024-10-21 08:18:18 +00:00
6633e9af1d
Add a button to manually reload the entities background map instead of automatically reloading it when it's changed. As the background map was only reloaded every 10 seconds, sometimes changing the background map quickly had no effect. Improve the layout of the DDNet settings menu. Align labels and UI elements and reduce unused empty space.
111 lines
2.4 KiB
C++
111 lines
2.4 KiB
C++
#include <base/system.h>
|
|
|
|
#include <engine/map.h>
|
|
#include <engine/shared/config.h>
|
|
|
|
#include <game/client/components/mapimages.h>
|
|
#include <game/client/components/maplayers.h>
|
|
|
|
#include <game/client/gameclient.h>
|
|
#include <game/layers.h>
|
|
|
|
#include "background.h"
|
|
|
|
CBackground::CBackground(int MapType, bool OnlineOnly) :
|
|
CMapLayers(MapType, OnlineOnly)
|
|
{
|
|
m_pLayers = new CLayers;
|
|
m_pBackgroundLayers = m_pLayers;
|
|
m_pImages = new CMapImages;
|
|
m_pBackgroundImages = m_pImages;
|
|
m_Loaded = false;
|
|
m_aMapName[0] = '\0';
|
|
}
|
|
|
|
CBackground::~CBackground()
|
|
{
|
|
delete m_pBackgroundLayers;
|
|
delete m_pBackgroundImages;
|
|
}
|
|
|
|
CBackgroundEngineMap *CBackground::CreateBGMap()
|
|
{
|
|
return new CBackgroundEngineMap;
|
|
}
|
|
|
|
void CBackground::OnInit()
|
|
{
|
|
m_pBackgroundMap = CreateBGMap();
|
|
m_pMap = m_pBackgroundMap;
|
|
|
|
m_pImages->m_pClient = GameClient();
|
|
Kernel()->RegisterInterface(m_pBackgroundMap);
|
|
if(g_Config.m_ClBackgroundEntities[0] != '\0' && str_comp(g_Config.m_ClBackgroundEntities, CURRENT_MAP))
|
|
LoadBackground();
|
|
}
|
|
|
|
void CBackground::LoadBackground()
|
|
{
|
|
if(m_Loaded && m_pMap == m_pBackgroundMap)
|
|
m_pMap->Unload();
|
|
|
|
m_Loaded = false;
|
|
m_pMap = m_pBackgroundMap;
|
|
m_pLayers = m_pBackgroundLayers;
|
|
m_pImages = m_pBackgroundImages;
|
|
|
|
str_copy(m_aMapName, g_Config.m_ClBackgroundEntities);
|
|
if(g_Config.m_ClBackgroundEntities[0] != '\0')
|
|
{
|
|
bool NeedImageLoading = false;
|
|
|
|
char aBuf[IO_MAX_PATH_LENGTH];
|
|
str_format(aBuf, sizeof(aBuf), "maps/%s", g_Config.m_ClBackgroundEntities);
|
|
if(str_comp(g_Config.m_ClBackgroundEntities, CURRENT_MAP) == 0)
|
|
{
|
|
m_pMap = Kernel()->RequestInterface<IEngineMap>();
|
|
if(m_pMap->IsLoaded())
|
|
{
|
|
m_pLayers = GameClient()->Layers();
|
|
m_pImages = &GameClient()->m_MapImages;
|
|
m_Loaded = true;
|
|
}
|
|
}
|
|
else if(m_pMap->Load(aBuf))
|
|
{
|
|
m_pLayers->InitBackground(m_pMap);
|
|
NeedImageLoading = true;
|
|
m_Loaded = true;
|
|
}
|
|
|
|
if(m_Loaded)
|
|
{
|
|
CMapLayers::OnMapLoad();
|
|
if(NeedImageLoading)
|
|
m_pImages->LoadBackground(m_pLayers, m_pMap);
|
|
}
|
|
}
|
|
}
|
|
|
|
void CBackground::OnMapLoad()
|
|
{
|
|
if(str_comp(g_Config.m_ClBackgroundEntities, CURRENT_MAP) == 0 || str_comp(g_Config.m_ClBackgroundEntities, m_aMapName))
|
|
{
|
|
LoadBackground();
|
|
}
|
|
}
|
|
|
|
void CBackground::OnRender()
|
|
{
|
|
if(!m_Loaded)
|
|
return;
|
|
|
|
if(Client()->State() != IClient::STATE_ONLINE && Client()->State() != IClient::STATE_DEMOPLAYBACK)
|
|
return;
|
|
|
|
if(g_Config.m_ClOverlayEntities != 100)
|
|
return;
|
|
|
|
CMapLayers::OnRender();
|
|
}
|