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

Merge pull request #49 from timgame/DDRace64

Browse source 
automapper supports rotation (and changed "CheckEmptyTiles" to "NoDefaultRule")
This commit is contained in:
Dennis Felsing 2014-09-27 11:02:42 +02:00
parent b94981019b 20aaa37cb9
commit 912c4fae5c
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,10 +53,11 @@ void CAutoMapper::Load(const char* pTileName)
{
// new index
int ID = 0;
char aFlip[128] = "";
char aFlip2[128] = "";
char aOrientation1[128] = "";
char aOrientation2[128] = "";
char aOrientation3[128] = "";
sscanf(pLine, "Index %d %127s %127s", &ID, aFlip, aFlip2);
sscanf(pLine, "Index %d %127s %127s %127s", &ID, aOrientation1, aOrientation2, aOrientation3);
CIndexRule NewIndexRule;
NewIndexRule.m_ID = ID;
@ -65,20 +66,34 @@ void CAutoMapper::Load(const char* pTileName)
NewIndexRule.m_BaseTile = false;
NewIndexRule.m_DefaultRule = true;
if(str_length(aFlip) > 0)
if(str_length(aOrientation1) > 0)
{
if(!str_comp(aFlip, "XFLIP"))
if(!str_comp(aOrientation1, "XFLIP"))
NewIndexRule.m_Flag |= TILEFLAG_VFLIP;
else if(!str_comp(aFlip, "YFLIP"))
else if(!str_comp(aOrientation1, "YFLIP"))
NewIndexRule.m_Flag |= TILEFLAG_HFLIP;
else if(!str_comp(aOrientation1, "ROTATE"))
NewIndexRule.m_Flag |= TILEFLAG_ROTATE;
}
if(str_length(aFlip2) > 0)
if(str_length(aOrientation2) > 0)
{
if(!str_comp(aFlip2, "XFLIP"))
if(!str_comp(aOrientation2, "XFLIP"))
NewIndexRule.m_Flag |= TILEFLAG_VFLIP;
else if(!str_comp(aFlip2, "YFLIP"))
else if(!str_comp(aOrientation2, "YFLIP"))
NewIndexRule.m_Flag |= TILEFLAG_HFLIP;
else if(!str_comp(aOrientation2, "ROTATE"))
NewIndexRule.m_Flag |= TILEFLAG_ROTATE;
}
if(str_length(aOrientation3) > 0)
{
if(!str_comp(aOrientation3, "XFLIP"))
NewIndexRule.m_Flag |= TILEFLAG_VFLIP;
else if(!str_comp(aOrientation3, "YFLIP"))
NewIndexRule.m_Flag |= TILEFLAG_HFLIP;
else if(!str_comp(aOrientation3, "ROTATE"))
NewIndexRule.m_Flag |= TILEFLAG_ROTATE;
}
// add the index rule object and make it current
@ -113,7 +128,7 @@ void CAutoMapper::Load(const char* pTileName)
{
sscanf(pLine, "Random %d", &pCurrentIndex->m_RandomValue);
}
else if(!str_comp_num(pLine, "CheckEmptyTiles", 15) && pCurrentIndex)
else if(!str_comp_num(pLine, "NoDefaultRule", 13) && pCurrentIndex)
{
pCurrentIndex->m_DefaultRule = false;
}