Mgv7: Do not limit river generation if no floatlands

paramat · paramat · commit 0c429bd1645d · 2017-06-19T02:20:14.000+01:00
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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -519,7 +519,8 @@ int MapgenV7::generateTerrain()`
`519`	`519`
`520`	`520`	`void MapgenV7::generateRidgeTerrain()`
`521`	`521`	`{`
`522`		`- if ((node_max.Y < water_level - 16) \|\| (node_max.Y > shadow_limit))`
	`522`	`+ if (node_max.Y < water_level - 16 \|\|`
	`523`	`+ ((spflags & MGV7_FLOATLANDS) && node_max.Y > shadow_limit))`
`523`	`524`	`return;`
`524`	`525`
`525`	`526`	`noise_ridge->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);`