summaryrefslogtreecommitdiffstats
path: root/src/Generating/DistortedHeightmap.cpp
diff options
context:
space:
mode:
authorSTRWarrior <niels.breuker@hotmail.nl>2014-07-21 18:53:56 +0200
committerSTRWarrior <niels.breuker@hotmail.nl>2014-07-21 18:53:56 +0200
commitbea574bf5425215bbed49ad4b3814804fd8757fc (patch)
tree279bde5369c9bc9c99e6c1975cfc76b4c6ed8878 /src/Generating/DistortedHeightmap.cpp
parentMerged branch 'origin/Foliage'. (diff)
downloadcuberite-bea574bf5425215bbed49ad4b3814804fd8757fc.tar
cuberite-bea574bf5425215bbed49ad4b3814804fd8757fc.tar.gz
cuberite-bea574bf5425215bbed49ad4b3814804fd8757fc.tar.bz2
cuberite-bea574bf5425215bbed49ad4b3814804fd8757fc.tar.lz
cuberite-bea574bf5425215bbed49ad4b3814804fd8757fc.tar.xz
cuberite-bea574bf5425215bbed49ad4b3814804fd8757fc.tar.zst
cuberite-bea574bf5425215bbed49ad4b3814804fd8757fc.zip
Diffstat (limited to 'src/Generating/DistortedHeightmap.cpp')
-rw-r--r--src/Generating/DistortedHeightmap.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/Generating/DistortedHeightmap.cpp b/src/Generating/DistortedHeightmap.cpp
index b46850a81..74d30c327 100644
--- a/src/Generating/DistortedHeightmap.cpp
+++ b/src/Generating/DistortedHeightmap.cpp
@@ -675,6 +675,8 @@ void cDistortedHeightmap::ComposeColumn(cChunkDesc & a_ChunkDesc, int a_RelX, in
case biForestHills:
case biTaigaHills:
case biExtremeHillsEdge:
+ case biExtremeHillsPlus:
+ case biExtremeHills:
case biJungle:
case biJungleHills:
case biJungleEdge:
@@ -750,18 +752,6 @@ void cDistortedHeightmap::ComposeColumn(cChunkDesc & a_ChunkDesc, int a_RelX, in
return;
}
- case biExtremeHillsPlus:
- case biExtremeHills:
- {
- // Select the pattern to use - stone or grass:
- NOISE_DATATYPE NoiseX = ((NOISE_DATATYPE)(m_CurChunkX * cChunkDef::Width + a_RelX)) / FrequencyX;
- NOISE_DATATYPE NoiseY = ((NOISE_DATATYPE)(m_CurChunkZ * cChunkDef::Width + a_RelZ)) / FrequencyZ;
- NOISE_DATATYPE Val = m_OceanFloorSelect.CubicNoise2D(NoiseX, NoiseY);
- const sBlockInfo * Pattern = (Val < -0.1) ? patStone.Get() : patGrass.Get();
- FillColumnPattern(a_ChunkDesc, a_RelX, a_RelZ, Pattern);
- return;
- }
-
case biExtremeHillsPlusM:
case biExtremeHillsM:
{