summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorp-mcgowan <mickeymcgowan@shaw.ca>2014-12-02 02:47:36 +0100
committerp-mcgowan <mickeymcgowan@shaw.ca>2014-12-02 02:47:36 +0100
commitbb5a7d8f151bc7c2426f16becc5f7a0c70ca7fef (patch)
treef10a5a34f2885ca359f2302d5eaf596e66314987
parentformatting and commenting fixes (diff)
downloadcuberite-bb5a7d8f151bc7c2426f16becc5f7a0c70ca7fef.tar
cuberite-bb5a7d8f151bc7c2426f16becc5f7a0c70ca7fef.tar.gz
cuberite-bb5a7d8f151bc7c2426f16becc5f7a0c70ca7fef.tar.bz2
cuberite-bb5a7d8f151bc7c2426f16becc5f7a0c70ca7fef.tar.lz
cuberite-bb5a7d8f151bc7c2426f16becc5f7a0c70ca7fef.tar.xz
cuberite-bb5a7d8f151bc7c2426f16becc5f7a0c70ca7fef.tar.zst
cuberite-bb5a7d8f151bc7c2426f16becc5f7a0c70ca7fef.zip
-rw-r--r--src/Generating/FinishGen.cpp13
-rw-r--r--src/Generating/FinishGen.h2
2 files changed, 9 insertions, 6 deletions
diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp
index cba45c0a1..7ef658dc2 100644
--- a/src/Generating/FinishGen.cpp
+++ b/src/Generating/FinishGen.cpp
@@ -371,7 +371,7 @@ void cFinishGenSprinkleFoliage::GenFinish(cChunkDesc & a_ChunkDesc)
(a_ChunkDesc.GetBlockType(x - 1, y, z) == E_BLOCK_AIR) &&
(a_ChunkDesc.GetBlockType(x, y, z + 1) == E_BLOCK_AIR) &&
(a_ChunkDesc.GetBlockType(x, y, z - 1) == E_BLOCK_AIR) &&
- IsDesertVariant(a_ChunkDesc.GetBiome(x, z)
+ IsDesertVariant(a_ChunkDesc.GetBiome(x, z))
)
{
a_ChunkDesc.SetBlockType(x, ++Top, z, E_BLOCK_CACTUS);
@@ -394,9 +394,12 @@ void cFinishGenSprinkleFoliage::GenFinish(cChunkDesc & a_ChunkDesc)
bool cFinishGenSprinkleFoliage::IsDesertVariant(EMCSBiome a_Biome)
{
- return (a_Biome == biDesertHills) ||
- (a_Biome == biDesert ) ||
- (a_Biome == biDesertM );
+ return
+ (
+ (a_Biome == biDesertHills) ||
+ (a_Biome == biDesert) ||
+ (a_Biome == biDesertM)
+ );
}
@@ -412,7 +415,7 @@ void cFinishGenSoulsandRims::GenFinish(cChunkDesc & a_ChunkDesc)
int ChunkZ = a_ChunkDesc.GetChunkZ() * cChunkDef::Width;
HEIGHTTYPE MaxHeight = a_ChunkDesc.GetMaxHeight();
- for (int x = 0; x < 16; x++)
+ for (int x = 0; x < 16; x++)
{
int xx = ChunkX + x;
for (int z = 0; z < 16; z++)
diff --git a/src/Generating/FinishGen.h b/src/Generating/FinishGen.h
index dd6a09c6a..d8d67671d 100644
--- a/src/Generating/FinishGen.h
+++ b/src/Generating/FinishGen.h
@@ -121,7 +121,7 @@ class cFinishGenSoulsandRims :
public cFinishGen
{
public:
- cFinishGenSoulsandRims(int a_Seed) :
+ cFinishGenSoulsandRims(int a_Seed) :
m_Noise(a_Seed)
{
}