From: Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Date: Fri, 15 Jul 2011 04:37:47 +0000 (+0200)
Subject: * regression fix, clay occurs again now
X-Git-Tag: 0.2.20110922~81^2~35^2~33
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0a38e542c1854422b95ddad2b9634693e342a5ff;p=oweals%2Fminetest.git

* regression fix, clay occurs again now
---

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index bb4785bbf..dfea862a5 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -1840,13 +1840,6 @@ void make_block(BlockMakeData *data)
 				bool water_detected = false;
 				bool have_clay = false;
 
-				// Determine whether to have clay in the sand here
-				double claynoise = noise2d_perlin(
-						0.5+(float)p2d.X/500, 0.5+(float)p2d.Y/500,
-						data->seed+4321, 6, 0.95);
-
-				have_clay = have_sand && (claynoise > 1.25);
-
 				// Use fast index incrementing
 				s16 start_y = node_max.Y+2;
 				v3s16 em = vmanip.m_area.getExtent();
@@ -1873,6 +1866,15 @@ void make_block(BlockMakeData *data)
 						{
 							if(have_sand)
 							{
+								// Determine whether to have clay in the sand here
+								double claynoise = noise2d_perlin(
+										0.5+(float)p2d.X/500, 0.5+(float)p2d.Y/500,
+										data->seed+4321, 6, 0.95) + 0.5;
+				
+								have_clay = (y <= WATER_LEVEL) && (y >= WATER_LEVEL-2) && (
+									((claynoise > 0) && (claynoise < 0.04) && (current_depth == 0)) ||
+									((claynoise > 0) && (claynoise < 0.12) && (current_depth == 1))
+									);
 								if (have_clay)
 									vmanip.m_data[i] = MapNode(CONTENT_CLAY);
 								else