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.

diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index ad242ae49bfc893c8d6d9470f4e85718abfc7596..e3922c53a6d405da3da94db6d5242f2f96940071 100644 (file)
--- 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);