From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 15 Aug 2011 12:11:00 +0000 (+0300)
Subject: Hopefully fixed msvc "'sqrt' : ambiguous call to overloaded function"
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=e57754868f63d5c104a582c1d2c5d1885a87c049;p=zefram%2Fminetest%2Fminetest_engine.git

Hopefully fixed msvc "'sqrt' : ambiguous call to overloaded function"
---

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index aac2fc22..0018b991 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -1818,7 +1818,7 @@ void make_block(BlockMakeData *data)
 							vmanip.m_data[i] = MapNode(CONTENT_GRAVEL);
 					}
 					else if(noisebuf_ground_crumbleness.get(x,y,z) <
-							-3.0 + MYMIN(0.1 * sqrt(MYMAX(0, -y)), 1.5))
+							-3.0 + MYMIN(0.1 * sqrt((float)MYMAX(0, -y)), 1.5))
 					{
 						vmanip.m_data[i] = MapNode(CONTENT_LAVASOURCE);
 						for(s16 x1=-1; x1<=1; x1++)