flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Simplefied SoulsandRims 

Replaced two for loops with a single if
This commit is contained in:
STRWarrior 2014-12-01 17:29:35 +01:00
parent cd0081bb67
commit 1bf0827a2f
1 changed files with 6 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Generating/FinishGen.cpp
View File

@ -417,42 +417,12 @@ void cFinishGenSoulsandRims::GenFinish(cChunkDesc & a_ChunkDesc)
continue;
}
// Check how many blocks there are above the current block. Don't go higher than 2 blocks, because we already bail out if that's the case.
int NumBlocksAbove = 0;
for (int I = y + 1; I <= y + 2; I++)
{
if (a_ChunkDesc.GetBlockType(x, I, z) != E_BLOCK_AIR)
{
NumBlocksAbove++;
}
else
{
break;
}
}
// There are too many blocks above the current block.
if (NumBlocksAbove == 2)
{
continue;
}
// Check how many blocks there below the current block. Don't go lower than 2 blocks, because we already bail out if that's the case.
int NumBlocksBelow = 0;
for (int I = y - 1; I >= y - 2; I--)
{
if (a_ChunkDesc.GetBlockType(x, I, z) != E_BLOCK_AIR)
{
NumBlocksBelow++;
}
else
{
break;
}
}
// There are too many blocks below the current block
if (NumBlocksBelow == 2)
if (
((a_ChunkDesc.GetBlockType(x, y + 1, z) != E_BLOCK_AIR) &&
( a_ChunkDesc.GetBlockType(x, y + 2, z) != E_BLOCK_AIR)) ||
((a_ChunkDesc.GetBlockType(x, y - 1, z) != E_BLOCK_AIR) &&
( a_ChunkDesc.GetBlockType(x, y - 2, z) != E_BLOCK_AIR))
)
{
continue;
}