1
0

Revert "Small code cleanup"

This commit is contained in:
worktycho
2015-05-05 22:08:40 +01:00
parent f3101f1d04
commit ee939cf8c8
4 changed files with 45 additions and 62 deletions

View File

@@ -103,7 +103,7 @@ void cSetChunkData::CalculateHeightMap(void)
int index = cChunkDef::MakeIndexNoCheck(x, y, z);
if (m_BlockTypes[index] != E_BLOCK_AIR)
{
m_HeightMap[x + z * cChunkDef::Width] = static_cast<HEIGHTTYPE>(y);
m_HeightMap[x + z * cChunkDef::Width] = (HEIGHTTYPE)y;
break;
}
} // for y
@@ -131,8 +131,11 @@ void cSetChunkData::RemoveInvalidBlockEntities(void)
ItemTypeToString(EntityBlockType).c_str(), EntityBlockType,
ItemTypeToString(WorldBlockType).c_str(), WorldBlockType
);
cBlockEntityList::iterator itr2 = itr;
++itr2;
delete *itr;
itr = m_BlockEntities.erase(itr);
m_BlockEntities.erase(itr);
itr = itr2;
}
else
{