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 need for all pos rule tests

Browse source
This commit is contained in:
Aerll 2018-07-27 00:23:53 +02:00
parent 52fbade30c
commit 292f0a2b09
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -312,7 +312,7 @@ void CAutoMapper::Proceed(CLayerTiles *pLayer, int ConfigID)
} }
// copy tiles // copy tiles
if (pRun->m_AutomapCopy) if(pRun->m_AutomapCopy)
{ {
for(int y = 0; y < pLayer->m_Height; y++) { for(int y = 0; y < pLayer->m_Height; y++) {
for(int x = 0; x < pLayer->m_Width; x++) for(int x = 0; x < pLayer->m_Width; x++)
@ -354,7 +354,7 @@ void CAutoMapper::Proceed(CLayerTiles *pLayer, int ConfigID)
if(pRule->m_Value == CPosRule::INDEX) if(pRule->m_Value == CPosRule::INDEX)
{ {
bool PosRuleTest = false; bool PosRuleTest = false;
for(int i = 0; i < pRule->m_aIndexList.size(); ++i) { for(int i = 0; i < pRule->m_aIndexList.size() && !PosRuleTest; ++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_Flag == -1 || CheckFlags == pRule->m_aIndexList[i].m_Flag))
PosRuleTest = true; PosRuleTest = true;
} }
@ -364,7 +364,7 @@ void CAutoMapper::Proceed(CLayerTiles *pLayer, int ConfigID)
else if(pRule->m_Value == CPosRule::NOTINDEX) else if(pRule->m_Value == CPosRule::NOTINDEX)
{ {
bool PosRuleTest = true; bool PosRuleTest = true;
for(int i = 0; i < pRule->m_aIndexList.size(); ++i) { for(int i = 0; i < pRule->m_aIndexList.size() && PosRuleTest; ++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_Flag == -1 || CheckFlags == pRule->m_aIndexList[i].m_Flag))
PosRuleTest = false; PosRuleTest = false;
} }