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

Merge #1245

Browse source 
1245: Fix automapper bug r=def- a=Aerll

There is some weird bug caused by my last changes, looks like automapper is working only fine for tiles without rotation.
![unknown](https://user-images.githubusercontent.com/31746984/43928232-73d9e8f4-9c30-11e8-802f-e4d239fdf8d4.png)
![unknown2](https://user-images.githubusercontent.com/31746984/43928244-793a25d4-9c30-11e8-9c37-e1fc5c3fd39b.png)
I'm not really sure why it doesn't work with -1, so I did some workaround.

Co-authored-by: Aerll <31746984+aerll@users.noreply.github.com>
This commit is contained in:
bors[bot] 2018-08-10 08:17:37 +00:00
parent 0b539df741 abc55396d0
commit 22ff46e204
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -122,13 +122,13 @@ void CAutoMapper::Load(const char* pTileName)
if(!str_comp(aValue, "EMPTY")) if(!str_comp(aValue, "EMPTY"))
{ {
Value = CPosRule::INDEX; Value = CPosRule::INDEX;
CIndexInfo NewIndexInfo = {0, 0}; CIndexInfo NewIndexInfo = {0, 0, false};
NewIndexList.add(NewIndexInfo); NewIndexList.add(NewIndexInfo);
} }
else if(!str_comp(aValue, "FULL")) else if(!str_comp(aValue, "FULL"))
{ {
Value = CPosRule::NOTINDEX; Value = CPosRule::NOTINDEX;
CIndexInfo NewIndexInfo1 = {0, 0}; CIndexInfo NewIndexInfo1 = {0, 0, false};
//CIndexInfo NewIndexInfo2 = {-1, 0}; //CIndexInfo NewIndexInfo2 = {-1, 0};
NewIndexList.add(NewIndexInfo1); NewIndexList.add(NewIndexInfo1);
//NewIndexList.add(NewIndexInfo2); //NewIndexList.add(NewIndexInfo2);
@ -151,13 +151,15 @@ void CAutoMapper::Load(const char* pTileName)
CIndexInfo NewIndexInfo; CIndexInfo NewIndexInfo;
NewIndexInfo.m_ID = ID; NewIndexInfo.m_ID = ID;
NewIndexInfo.m_Flag = -1; NewIndexInfo.m_Flag = 0;
NewIndexInfo.m_TestFlag = false;
if(!str_comp(aOrientation1, "OR")) { if(!str_comp(aOrientation1, "OR")) {
NewIndexList.add(NewIndexInfo); NewIndexList.add(NewIndexInfo);
pWord += 2; pWord += 2;
continue; continue;
} else if(str_length(aOrientation1) > 0) { } else if(str_length(aOrientation1) > 0) {
NewIndexInfo.m_TestFlag = true;
if(!str_comp(aOrientation1, "XFLIP")) if(!str_comp(aOrientation1, "XFLIP"))
NewIndexInfo.m_Flag = TILEFLAG_VFLIP; NewIndexInfo.m_Flag = TILEFLAG_VFLIP;
else if(!str_comp(aOrientation1, "YFLIP")) else if(!str_comp(aOrientation1, "YFLIP"))
@ -166,6 +168,8 @@ void CAutoMapper::Load(const char* pTileName)
NewIndexInfo.m_Flag = TILEFLAG_ROTATE; NewIndexInfo.m_Flag = TILEFLAG_ROTATE;
else if(!str_comp(aOrientation1, "NONE")) else if(!str_comp(aOrientation1, "NONE"))
NewIndexInfo.m_Flag = 0; NewIndexInfo.m_Flag = 0;
else
NewIndexInfo.m_TestFlag = false;
} else { } else {
NewIndexList.add(NewIndexInfo); NewIndexList.add(NewIndexInfo);
break; break;
@ -264,7 +268,7 @@ void CAutoMapper::Load(const char* pTileName)
if(!Found && m_lConfigs[g].m_aRuns[h].m_aIndexRules[i].m_DefaultRule) if(!Found && m_lConfigs[g].m_aRuns[h].m_aIndexRules[i].m_DefaultRule)
{ {
array<CIndexInfo> NewIndexList; array<CIndexInfo> NewIndexList;
CIndexInfo NewIndexInfo = {0, 0}; CIndexInfo NewIndexInfo = {0, 0, false};
NewIndexList.add(NewIndexInfo); NewIndexList.add(NewIndexInfo);
CPosRule NewPosRule = {0, 0, CPosRule::NOTINDEX, NewIndexList}; CPosRule NewPosRule = {0, 0, CPosRule::NOTINDEX, NewIndexList};
m_lConfigs[g].m_aRuns[h].m_aIndexRules[i].m_aRules.add(NewPosRule); m_lConfigs[g].m_aRuns[h].m_aIndexRules[i].m_aRules.add(NewPosRule);
@ -355,7 +359,7 @@ void CAutoMapper::Proceed(CLayerTiles *pLayer, int ConfigID)
{ {
RespectRules = false; RespectRules = false;
for(int i = 0; i < pRule->m_aIndexList.size(); ++i) { for(int i = 0; i < pRule->m_aIndexList.size(); ++i) {
if(CheckIndex == pRule->m_aIndexList[i].m_ID && (pRule->m_aIndexList[i].m_Flag == -1 || CheckFlags == pRule->m_aIndexList[i].m_Flag)) if(CheckIndex == pRule->m_aIndexList[i].m_ID && (!pRule->m_aIndexList[i].m_TestFlag || CheckFlags == pRule->m_aIndexList[i].m_Flag))
{ {
RespectRules = true; RespectRules = true;
break; break;
@ -365,7 +369,7 @@ void CAutoMapper::Proceed(CLayerTiles *pLayer, int ConfigID)
else if(pRule->m_Value == CPosRule::NOTINDEX) else if(pRule->m_Value == CPosRule::NOTINDEX)
{ {
for(int i = 0; i < pRule->m_aIndexList.size(); ++i) { for(int i = 0; i < pRule->m_aIndexList.size(); ++i) {
if(CheckIndex == pRule->m_aIndexList[i].m_ID && (pRule->m_aIndexList[i].m_Flag == -1 || CheckFlags == pRule->m_aIndexList[i].m_Flag)) if(CheckIndex == pRule->m_aIndexList[i].m_ID && (!pRule->m_aIndexList[i].m_TestFlag || CheckFlags == pRule->m_aIndexList[i].m_Flag))
{ {
RespectRules = false; RespectRules = false;
break; break;

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

@ -9,6 +9,7 @@ class CAutoMapper
{ {
int m_ID; int m_ID;
int m_Flag; int m_Flag;
bool m_TestFlag;
}; };
struct CPosRule struct CPosRule