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

reformat for lua and CI

Browse Source
This commit is contained in:
p-mcgowan 2014-12-01 17:47:36 -08:00
parent 3bf111c69e
commit bb5a7d8f15
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Generating/FinishGen.cpp
View File

@ -371,7 +371,7 @@ void cFinishGenSprinkleFoliage::GenFinish(cChunkDesc & a_ChunkDesc)
(a_ChunkDesc.GetBlockType(x - 1, y, z) == E_BLOCK_AIR) && (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) &&
(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); 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) bool cFinishGenSprinkleFoliage::IsDesertVariant(EMCSBiome a_Biome)
{ {
return (a_Biome == biDesertHills) || return
(a_Biome == biDesert ) || (
(a_Biome == biDesertM ); (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; int ChunkZ = a_ChunkDesc.GetChunkZ() * cChunkDef::Width;
HEIGHTTYPE MaxHeight = a_ChunkDesc.GetMaxHeight(); HEIGHTTYPE MaxHeight = a_ChunkDesc.GetMaxHeight();
for (int x = 0; x < 16; x++) for (int x = 0; x < 16; x++)
{ {
int xx = ChunkX + x; int xx = ChunkX + x;
for (int z = 0; z < 16; z++) for (int z = 0; z < 16; z++)

2
src/Generating/FinishGen.h
View File

@ -121,7 +121,7 @@ class cFinishGenSoulsandRims :
public cFinishGen public cFinishGen
{ {
public: public:
cFinishGenSoulsandRims(int a_Seed) : cFinishGenSoulsandRims(int a_Seed) :
m_Noise(a_Seed) m_Noise(a_Seed)
{ {
} }