From: Perttu Ahola <celeron55@gmail.com>
Date: Fri, 3 Feb 2012 13:19:05 +0000 (+0200)
Subject: Fix deep ground cave generation a bit
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=66bf7b0b01d3dcff4c318d44c7bb58dba975c131;p=zefram%2Fminetest%2Fminetest_engine.git

Fix deep ground cave generation a bit
---

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 0dfd6731..c6893eed 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -1416,12 +1416,14 @@ void make_block(BlockMakeData *data)
 			u32 i = vmanip.m_area.index(v3s16(p2d.X, node_min.Y, p2d.Y));
 			for(s16 y=node_min.Y; y<=node_max.Y; y++)
 			{
-				if(y <= surface_y)
-					vmanip.m_data[i] = MapNode(c_stone);
-				else if(y <= WATER_LEVEL)
+				if(y <= surface_y){
+					if(vmanip.m_data[i].getContent() == CONTENT_IGNORE)
+						vmanip.m_data[i] = MapNode(c_stone);
+				} else if(y <= WATER_LEVEL){
 					vmanip.m_data[i] = MapNode(c_water_source);
-				else
+				} else {
 					vmanip.m_data[i] = MapNode(c_air);
+				}
 
 				vmanip.m_area.add_y(em, i, 1);
 			}