summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-07-22 23:20:06 +0200
committerarchshift <admin@archshift.com>2014-07-22 23:20:06 +0200
commitf78bf254e38079ede9ac16f72c5da081a7a67ad3 (patch)
tree1097c53423dc0caa27a6262315d39ed09a768ba7 /src
parentExport SendEntityAnimation to ToLua (diff)
parentExtreme Hills M variant only spawn with grass and stone (diff)
downloadcuberite-f78bf254e38079ede9ac16f72c5da081a7a67ad3.tar
cuberite-f78bf254e38079ede9ac16f72c5da081a7a67ad3.tar.gz
cuberite-f78bf254e38079ede9ac16f72c5da081a7a67ad3.tar.bz2
cuberite-f78bf254e38079ede9ac16f72c5da081a7a67ad3.tar.lz
cuberite-f78bf254e38079ede9ac16f72c5da081a7a67ad3.tar.xz
cuberite-f78bf254e38079ede9ac16f72c5da081a7a67ad3.tar.zst
cuberite-f78bf254e38079ede9ac16f72c5da081a7a67ad3.zip
Diffstat (limited to 'src')
-rw-r--r--src/Generating/DistortedHeightmap.cpp16
1 files changed, 3 insertions, 13 deletions
diff --git a/src/Generating/DistortedHeightmap.cpp b/src/Generating/DistortedHeightmap.cpp
index b46850a81..1337896ab 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:
{
@@ -769,7 +759,7 @@ void cDistortedHeightmap::ComposeColumn(cChunkDesc & a_ChunkDesc, int a_RelX, in
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.9) ? patStone.Get() : ((Val > 0) ? patGravel.Get() : patGrass.Get());
+ const sBlockInfo * Pattern = (Val < 0.0) ? patStone.Get() : patGrass.Get();
FillColumnPattern(a_ChunkDesc, a_RelX, a_RelZ, Pattern);
return;
}