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

Merge pull request #42 from timgame/DDRace64

Browse source 
added option to automap tiles with index 0
This commit is contained in:
Dennis Felsing 2014-09-20 21:01:44 +02:00
parent 58f768e8b1 8dc728de96
commit 8953d37369
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -63,6 +63,7 @@ void CAutoMapper::Load(const char* pTileName)
NewIndexRule.m_Flag = 0;
NewIndexRule.m_RandomValue = 0;
NewIndexRule.m_BaseTile = false;
NewIndexRule.m_DefaultRule = true;
if(str_length(aFlip) > 0)
{
@ -112,6 +113,10 @@ void CAutoMapper::Load(const char* pTileName)
{
sscanf(pLine, "Random %d", &pCurrentIndex->m_RandomValue);
}
else if(!str_comp_num(pLine, "CheckEmptyTiles", 15) && pCurrentIndex)
{
pCurrentIndex->m_DefaultRule = false;
}
}
}
}
@ -131,7 +136,7 @@ void CAutoMapper::Load(const char* pTileName)
break;
}
}
if(!Found)
if(!Found && m_lConfigs[h].m_aIndexRules[i].m_DefaultRule)
{
CPosRule NewPosRule = {0, 0, CPosRule::FULL, false};
m_lConfigs[h].m_aIndexRules[i].m_aRules.add(NewPosRule);

1
src/game/editor/auto_map.h
View file

@ -26,6 +26,7 @@ class CAutoMapper
int m_Flag;
int m_RandomValue;
bool m_BaseTile;
bool m_DefaultRule;
};
struct CConfiguration