Add shutdown hook interface to Lua API

[minetest.git] / src / mapgen.cpp

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 67e92f4498bca02d0f458a64cb818e7b498fa760..782f00b62bb0de7e7e10c0285b0f7d3d2bfe4f10 100644 (file)
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -132,7 +132,8 @@ void make_tree(ManualMapVoxelManipulator &vmanip, v3s16 p0,
        for(s16 ii=0; ii<trunk_h; ii++)
        {
                if(vmanip.m_area.contains(p1))
-                       vmanip.m_data[vmanip.m_area.index(p1)] = treenode;
+                       if(ii == 0 || vmanip.getNodeNoExNoEmerge(p1).getContent() == CONTENT_AIR)
+                               vmanip.m_data[vmanip.m_area.index(p1)] = treenode;
                p1.Y++;
        }
 
@@ -1228,7 +1229,7 @@ double base_rock_level_2d(u64 seed, v2s16 p)
                        0.5+(float)p.X/125., 0.5+(float)p.Y/125.,
                        seed-932, 5, 0.7);
        b = rangelim(b, 0.0, 1000.0);
-       b = pow(b, 7);
+       b = b*b*b*b*b*b*b;
        b *= 5;
        b = rangelim(b, 0.5, 1000.0);
        // Values 1.5...100 give quite horrible looking slopes