Simplefied SoulsandRims

Replaced two for loops with a single if
cuberite · Dec 1, 2014 · 1bf0827 · 1bf0827
1 parent cd0081b
commit 1bf0827
Showing 1 changed file with 6 additions and 36 deletions.
diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp
@@ -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;
 				}