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

Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo's

This commit is contained in:
STRWarrior 2014-01-18 14:16:07 +01:00
parent dd7c02bba9
commit ca27f87272
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Generating/ComposableGenerator.cpp
View File

@ -442,9 +442,9 @@ void cComposableGenerator::InitFinishGens(cIniFile & a_IniFile)
{ {
m_FinishGens.push_back(new cFinishGenSprinkleFoliage(Seed)); m_FinishGens.push_back(new cFinishGenSprinkleFoliage(Seed));
} }
else if (NoCaseCompare(*itr, "NetherSprinkleFoliage") == 0) else if (NoCaseCompare(*itr, "NetherClumpFoliage") == 0)
{ {
m_FinishGens.push_back(new cFinishGenNetherSprinkleFoliage(Seed)); m_FinishGens.push_back(new cFinishGenNetherClumpFoliage(Seed));
} }
else if (NoCaseCompare(*itr, "WaterSprings") == 0) else if (NoCaseCompare(*itr, "WaterSprings") == 0)
{ {

12
src/Generating/FinishGen.cpp
View File

@ -41,9 +41,9 @@ static inline bool IsWater(BLOCKTYPE a_BlockType)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// cFinishGenNetherSprinkleFoliage: // cFinishGenNetherClumpFoliage:
void cFinishGenNetherSprinkleFoliage::GenFinish(cChunkDesc & a_ChunkDesc) void cFinishGenNetherClumpFoliage::GenFinish(cChunkDesc & a_ChunkDesc)
{ {
double ChunkX = a_ChunkDesc.GetChunkX() + 0.1; // We can't devide through 0 so lets add 0.1 to all the chunk coordinates. double ChunkX = a_ChunkDesc.GetChunkX() + 0.1; // We can't devide through 0 so lets add 0.1 to all the chunk coordinates.
double ChunkZ = a_ChunkDesc.GetChunkZ() + 0.1; double ChunkZ = a_ChunkDesc.GetChunkZ() + 0.1;
@ -96,15 +96,15 @@ void cFinishGenNetherSprinkleFoliage::GenFinish(cChunkDesc & a_ChunkDesc)
NOISE_DATATYPE BlockType = m_Noise.CubicNoise1D((float) (ChunkX * ChunkZ) / (y * 0.1f)); NOISE_DATATYPE BlockType = m_Noise.CubicNoise1D((float) (ChunkX * ChunkZ) / (y * 0.1f));
if (BlockType < -0.7) if (BlockType < -0.7)
{ {
TryPlaceClumb(a_ChunkDesc, PosX, y, PosZ, E_BLOCK_BROWN_MUSHROOM); TryPlaceClump(a_ChunkDesc, PosX, y, PosZ, E_BLOCK_BROWN_MUSHROOM);
} }
else if (BlockType < 0) else if (BlockType < 0)
{ {
TryPlaceClumb(a_ChunkDesc, PosX, y, PosZ, E_BLOCK_RED_MUSHROOM); TryPlaceClump(a_ChunkDesc, PosX, y, PosZ, E_BLOCK_RED_MUSHROOM);
} }
else if (BlockType < 0.7) else if (BlockType < 0.7)
{ {
TryPlaceClumb(a_ChunkDesc, PosX, y, PosZ, E_BLOCK_FIRE); TryPlaceClump(a_ChunkDesc, PosX, y, PosZ, E_BLOCK_FIRE);
} }
} }
} }
@ -113,7 +113,7 @@ void cFinishGenNetherSprinkleFoliage::GenFinish(cChunkDesc & a_ChunkDesc)
void cFinishGenNetherSprinkleFoliage::TryPlaceClumb(cChunkDesc & a_ChunkDesc, int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_Block) void cFinishGenNetherSprinkleFoliage::TryPlaceClump(cChunkDesc & a_ChunkDesc, int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_Block)
{ {
bool IsFireBlock = a_Block == E_BLOCK_FIRE; bool IsFireBlock = a_Block == E_BLOCK_FIRE;

4
src/Generating/FinishGen.h
View File

@ -51,7 +51,7 @@ class cFinishGenNetherSprinkleFoliage :
public cFinishGen public cFinishGen
{ {
public: public:
cFinishGenNetherSprinkleFoliage(int a_Seed) : cFinishGenNetherClumpFoliage(int a_Seed) :
m_Noise(a_Seed), m_Noise(a_Seed),
m_Seed(a_Seed) m_Seed(a_Seed)
{ {
@ -61,7 +61,7 @@ protected:
cNoise m_Noise; cNoise m_Noise;
int m_Seed; int m_Seed;
void TryPlaceClumb(cChunkDesc & a_ChunkDesc, int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_Block); void TryPlaceClump(cChunkDesc & a_ChunkDesc, int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_Block);
virtual void GenFinish(cChunkDesc & a_ChunkDesc) override; virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
} ; } ;