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

Fix automapper

Browse source
This commit is contained in:
def 2013-12-28 13:59:14 +01:00
parent a91690f870
commit 80b33220bf
1 changed files with 15 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/game/editor/auto_map.cpp
View file

@ -80,26 +80,6 @@ void CAutoMapper::Load(const char* pTileName)
NewIndexRule.m_Flag |= TILEFLAG_HFLIP;
}
// add default rule for Pos 0 0 if there is none
if(pCurrentIndex)
{
bool Found = false;
for(int i = 0; i < pCurrentIndex->m_aRules.size(); ++i)
{
CPosRule *pRule = &pCurrentIndex->m_aRules[i];
if(pRule->m_X == 0 && pRule->m_Y == 0)
{
Found = true;
break;
}
}
if(!Found)
{
CPosRule NewPosRule = {0, 0, CPosRule::FULL, false};
pCurrentIndex->m_aRules.add(NewPosRule);
}
}
// add the index rule object and make it current
int ArrayID = pCurrentConf->m_aIndexRules.add(NewIndexRule);
pCurrentIndex = &pCurrentConf->m_aIndexRules[ArrayID];
@ -137,22 +117,25 @@ void CAutoMapper::Load(const char* pTileName)
}
// add default rule for Pos 0 0 if there is none
if(pCurrentIndex)
for (int h = 0; h < m_lConfigs.size(); ++h)
{
bool Found = false;
for(int i = 0; i < pCurrentIndex->m_aRules.size(); ++i)
for(int i = 0; i < m_lConfigs[h].m_aIndexRules.size(); ++i)
{
CPosRule *pRule = &pCurrentIndex->m_aRules[i];
if(pRule->m_X == 0 && pRule->m_Y == 0)
bool Found = false;
for(int j = 0; j < m_lConfigs[h].m_aIndexRules[i].m_aRules.size(); ++j)
{
Found = true;
break;
CPosRule *pRule = &m_lConfigs[h].m_aIndexRules[i].m_aRules[j];
if(pRule && pRule->m_X == 0 && pRule->m_Y == 0)
{
Found = true;
break;
}
}
if(!Found)
{
CPosRule NewPosRule = {0, 0, CPosRule::FULL, false};
m_lConfigs[h].m_aIndexRules[i].m_aRules.add(NewPosRule);
}
}
if(!Found)
{
CPosRule NewPosRule = {0, 0, CPosRule::FULL, false};
pCurrentIndex->m_aRules.add(NewPosRule);
}
}