From: proller <proller@github.com>
Date: Thu, 25 Apr 2013 18:52:23 +0000 (+0400)
Subject: Tune finite liquids, indev huge caves
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=d83602d98ed9df6a8b9bc0d68a14b824777e2032;p=zefram%2Fminetest%2Fminetest_engine.git

Tune finite liquids, indev huge caves
---

diff --git a/src/map.cpp b/src/map.cpp
index c4884a45..821805d4 100644
--- 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
index 7f0faf16..ce5cfbfe 100644
--- 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;