aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorparamat <paramat@users.noreply.github.com>2017-06-18 02:11:05 +0100
committerparamat <mat.gregory@virginmedia.com>2017-06-19 02:20:14 +0100
commit0c429bd1645d738e721f713429d8ba83c3964b8f (patch)
tree06345a0eac0ebfd571e11d7793c3234d11c3ab7b /src
parentea4d407082dd120bb6b3b1e9c869e88f26b001b1 (diff)
downloadminetest-0c429bd1645d738e721f713429d8ba83c3964b8f.tar.gz
minetest-0c429bd1645d738e721f713429d8ba83c3964b8f.tar.bz2
minetest-0c429bd1645d738e721f713429d8ba83c3964b8f.zip
Mgv7: Do not limit river generation if no floatlands
Previously, the carving of rivers was disabled above 'shadow_limit' even if floatlands were disabled. This caused rivers to be unnecessarily disabled if mapgen was customised to have surface level above y = 1024.
Diffstat (limited to 'src')
-rw-r--r--src/mapgen_v7.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index ad242ae49..e3922c53a 100644
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -519,7 +519,8 @@ int MapgenV7::generateTerrain()
void MapgenV7::generateRidgeTerrain()
{
- if ((node_max.Y < water_level - 16) || (node_max.Y > shadow_limit))
+ if (node_max.Y < water_level - 16 ||
+ ((spflags & MGV7_FLOATLANDS) && node_max.Y > shadow_limit))
return;
noise_ridge->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);