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

No magic string

Browse source
This commit is contained in:
def 2015-08-27 16:32:45 +02:00
parent 7693d8d9d6
commit 8511a4d1f4
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,7 +39,7 @@ void CBackground::OnInit()
m_pLayers->m_pClient = GameClient();
Kernel()->ReregisterInterface(static_cast<IEngineMap*>(m_pMap));
str_format(m_aMapName, sizeof(m_aMapName), "%s", g_Config.m_ClBackgroundEntities);
if(str_comp(g_Config.m_ClBackgroundEntities, "%current%"))
if(str_comp(g_Config.m_ClBackgroundEntities, CURRENT))
LoadBackground();
}
@ -63,12 +63,12 @@ void CBackground::LoadBackground()
{
m_pLayers->m_pLayers->InitBackground(m_pMap);
m_pImages->LoadBackground(m_pMap);
RenderTools()->RenderTilemapGenerateSkip(m_pLayers->m_pLayers);
RenderTools()->RenderTilemapGenerateSkip(m_pLayers->m_pLayers);
m_Loaded = true;
}
else if(str_comp(g_Config.m_ClBackgroundEntities, "%current%") == 0)
else if(str_comp(g_Config.m_ClBackgroundEntities, CURRENT) == 0)
{
m_pMap = Kernel()->RequestInterface<IEngineMap>();
m_pMap = Kernel()->RequestInterface<IEngineMap>();
m_pLayers->m_pLayers = GameClient()->Layers();
m_pImages = GameClient()->m_pMapimages;
m_Loaded = true;
@ -79,7 +79,7 @@ void CBackground::LoadBackground()
void CBackground::OnMapLoad()
{
if(str_comp(g_Config.m_ClBackgroundEntities, "%current%") == 0 || str_comp(g_Config.m_ClBackgroundEntities, m_aMapName))
if(str_comp(g_Config.m_ClBackgroundEntities, CURRENT) == 0 || str_comp(g_Config.m_ClBackgroundEntities, m_aMapName))
LoadBackground();
}

2
src/game/client/components/background.h
View file

@ -2,6 +2,8 @@
#define GAME_CLIENT_COMPONENTS_BACKGROUND_H
#include <game/client/component.h>
#define CURRENT "%current%"
class CBackground : public CComponent
{
class CMapLayers *m_pLayers;