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

Merge #2653

Browse source 
2653: Fix background map loading r=def- a=Jupeyy

As reported.

Tested all possible contexts, hope this is right now

Co-authored-by: Jupeyy <jupjopjap@gmail.com>
This commit is contained in:
bors[bot] 2020-08-26 13:49:30 +00:00 committed by GitHub
parent 1a20f9a6ae 14d383ef15
commit efdd35439e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/game/client/components/background.cpp
View file

@ -50,14 +50,16 @@ void CBackground::LoadBackground()
m_pLayers = m_pBackgroundLayers; m_pLayers = m_pBackgroundLayers;
m_pImages = m_pBackgroundImages; m_pImages = m_pBackgroundImages;
bool NeedImageLoading = false;
str_copy(m_aMapName, g_Config.m_ClBackgroundEntities, sizeof(m_aMapName)); str_copy(m_aMapName, g_Config.m_ClBackgroundEntities, sizeof(m_aMapName));
char aBuf[128]; char aBuf[128];
str_format(aBuf, sizeof(aBuf), "maps/%s", g_Config.m_ClBackgroundEntities); str_format(aBuf, sizeof(aBuf), "maps/%s", g_Config.m_ClBackgroundEntities);
if(m_pMap->Load(aBuf)) if(m_pMap->Load(aBuf))
{ {
m_pLayers->InitBackground(m_pMap); m_pLayers->InitBackground(m_pMap);
m_pImages->LoadBackground(m_pMap);
RenderTools()->RenderTilemapGenerateSkip(m_pLayers); RenderTools()->RenderTilemapGenerateSkip(m_pLayers);
NeedImageLoading = true;
m_Loaded = true; m_Loaded = true;
} }
else if(str_comp(g_Config.m_ClBackgroundEntities, CURRENT) == 0) else if(str_comp(g_Config.m_ClBackgroundEntities, CURRENT) == 0)
@ -72,7 +74,11 @@ void CBackground::LoadBackground()
} }
if(m_Loaded) if(m_Loaded)
{
CMapLayers::OnMapLoad(); CMapLayers::OnMapLoad();
if(NeedImageLoading)
m_pImages->LoadBackground(m_pLayers, m_pMap);
}
m_LastLoad = time_get(); m_LastLoad = time_get();
} }

16
src/game/client/components/mapimages.cpp
View file

@ -29,10 +29,8 @@ void CMapImages::OnInit()
InitOverlayTextures(); InitOverlayTextures();
} }
void CMapImages::OnMapLoad() void CMapImages::OnMapLoadImpl(class CLayers *pLayers, IMap *pMap)
{ {
IMap *pMap = Kernel()->RequestInterface<IMap>();
// unload all textures // unload all textures
for(int i = 0; i < m_Count; i++) for(int i = 0; i < m_Count; i++)
{ {
@ -45,7 +43,6 @@ void CMapImages::OnMapLoad()
int Start; int Start;
pMap->GetType(MAPITEMTYPE_IMAGE, &Start, &m_Count); pMap->GetType(MAPITEMTYPE_IMAGE, &Start, &m_Count);
CLayers *pLayers = m_pClient->Layers();
for(int g = 0; g < pLayers->NumGroups(); g++) for(int g = 0; g < pLayers->NumGroups(); g++)
{ {
CMapItemGroup *pGroup = pLayers->GetGroup(g); CMapItemGroup *pGroup = pLayers->GetGroup(g);
@ -99,9 +96,16 @@ void CMapImages::OnMapLoad()
} }
} }
void CMapImages::LoadBackground(class IMap *pMap) void CMapImages::OnMapLoad()
{ {
CMapImages::OnMapLoad(); IMap *pMap = Kernel()->RequestInterface<IMap>();
CLayers *pLayers = m_pClient->Layers();
OnMapLoadImpl(pLayers, pMap);
}
void CMapImages::LoadBackground(class CLayers *pLayers, class IMap *pMap)
{
OnMapLoadImpl(pLayers, pMap);
} }
IGraphics::CTextureHandle CMapImages::GetEntities() IGraphics::CTextureHandle CMapImages::GetEntities()

3
src/game/client/components/mapimages.h
View file

@ -20,9 +20,10 @@ public:
IGraphics::CTextureHandle Get(int Index) const { return m_aTextures[Index]; } IGraphics::CTextureHandle Get(int Index) const { return m_aTextures[Index]; }
int Num() const { return m_Count; } int Num() const { return m_Count; }
void OnMapLoadImpl(class CLayers *pLayers, class IMap *pMap);
virtual void OnMapLoad(); virtual void OnMapLoad();
virtual void OnInit(); virtual void OnInit();
void LoadBackground(class IMap *pMap); void LoadBackground(class CLayers *pLayers, class IMap *pMap);
// DDRace // DDRace
IGraphics::CTextureHandle GetEntities(); IGraphics::CTextureHandle GetEntities();