Tune finite liquids, indev huge caves

proller · proller · commit d83602d98ed9 · 2013-04-25T22:59:32.000+04:00
diff --git a/src/map.cpp b/src/map.cpp
@@ -1764,7 +1764,7 @@ void Map::transformLiquidsFinite(std::map<v3s16, MapBlock*> & modified_blocks)
 		}
 
 		// prevent lakes in air above unloaded blocks
-		if (p0.Y > water_level && neighbors[D_BOTTOM].n.getContent() == CONTENT_IGNORE) {
+		if (liquid_levels[D_TOP] == 0 && (p0.Y > water_level || !fast_flood) && neighbors[D_BOTTOM].n.getContent() == CONTENT_IGNORE) {
 			--total_level;
 		}
 
diff --git a/src/mapgen_indev.cpp b/src/mapgen_indev.cpp
@@ -303,7 +303,7 @@ CaveIndev::CaveIndev(Mapgen *mg, PseudoRandom *ps, PseudoRandom *ps2,
 			flooded = !ps->range(0, 3);
 			tunnel_routepoints = ps->range(5, 30);
 			min_tunnel_diameter = 30;
-			max_tunnel_diameter = ps->range(40, ps->range(80, 200));
+			max_tunnel_diameter = ps->range(40, ps->range(80, 150));
 		} else {
 			tunnel_routepoints = ps->range(5, ps->range(15,30));
 			min_tunnel_diameter = 5;

Original file line number	Diff line number	Diff line change
`@@ -1764,7 +1764,7 @@ void Map::transformLiquidsFinite(std::map<v3s16, MapBlock*> & modified_blocks)`
`1764`	`1764`	`}`
`1765`	`1765`
`1766`	`1766`	`// prevent lakes in air above unloaded blocks`
`1767`		`- if (p0.Y > water_level && neighbors[D_BOTTOM].n.getContent() == CONTENT_IGNORE) {`
	`1767`	`+ if (liquid_levels[D_TOP] == 0 && (p0.Y > water_level \|\| !fast_flood) && neighbors[D_BOTTOM].n.getContent() == CONTENT_IGNORE) {`
`1768`	`1768`	`--total_level;`
`1769`	`1769`	`}`
`1770`	`1770`