summaryrefslogtreecommitdiffstats
path: root/src/Generating
diff options
context:
space:
mode:
authorSTRWarrior <niels.breuker@hotmail.nl>2014-07-20 16:31:28 +0200
committerSTRWarrior <niels.breuker@hotmail.nl>2014-07-20 16:31:28 +0200
commit51ad6cd1b22914aecd7e27d6a4a35853459fdb94 (patch)
tree049f06593223d3e613a40b263356fd75f7736d24 /src/Generating
parentFirst attempt for a new foliage finisher (diff)
downloadcuberite-51ad6cd1b22914aecd7e27d6a4a35853459fdb94.tar
cuberite-51ad6cd1b22914aecd7e27d6a4a35853459fdb94.tar.gz
cuberite-51ad6cd1b22914aecd7e27d6a4a35853459fdb94.tar.bz2
cuberite-51ad6cd1b22914aecd7e27d6a4a35853459fdb94.tar.lz
cuberite-51ad6cd1b22914aecd7e27d6a4a35853459fdb94.tar.xz
cuberite-51ad6cd1b22914aecd7e27d6a4a35853459fdb94.tar.zst
cuberite-51ad6cd1b22914aecd7e27d6a4a35853459fdb94.zip
Diffstat (limited to 'src/Generating')
-rw-r--r--src/Generating/FinishGen.cpp3
-rw-r--r--src/Generating/FinishGen.h6
2 files changed, 4 insertions, 5 deletions
diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp
index 06c1dcbbe..86f5711a7 100644
--- a/src/Generating/FinishGen.cpp
+++ b/src/Generating/FinishGen.cpp
@@ -170,8 +170,7 @@ void cFinishGenFoliage::GenFinish(cChunkDesc & a_ChunkDesc)
for (int z = 1; z < cChunkDef::Width; z++)
{
int zz = z + a_ChunkDesc.GetChunkZ();
- //if (true)
- if (m_Noise.CubicNoise2D((float) xx + m_Noise.CubicNoise1D(xx), zz + m_Noise.CubicNoise1D(zz)) < GetBiomeDensity(a_ChunkDesc.GetBiome(x, z)))
+ if (m_Noise.CubicNoise2D((float) xx + m_Noise.CubicNoise1D(xx), (float) zz + m_Noise.CubicNoise1D(zz)) < GetBiomeDensity(a_ChunkDesc.GetBiome(x, z)))
{
for (int y = a_ChunkDesc.GetHeight(x, z) + 1; y >= 1; y--)
{
diff --git a/src/Generating/FinishGen.h b/src/Generating/FinishGen.h
index ea322c7ae..d2968e592 100644
--- a/src/Generating/FinishGen.h
+++ b/src/Generating/FinishGen.h
@@ -92,14 +92,14 @@ protected:
case biSavannaPlateauM:
case biPlains:
{
- return 0.0;
+ return 0.0f;
}
default:
{
- return -0.4;
+ return -0.4f;
}
}
- return -0.3;
+ return -0.3f;
}
};