Fixed merge issues with saplings, ready to pull now!

diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp
index 30839773538934bc39ca3388df3ad36900775ab9..af8aa5207f884fa38e35ede4a1899b161b092c8b 100644 (file)
--- a/src/content_mapnode.cpp
+++ b/src/content_mapnode.cpp
@@ -243,7 +243,7 @@ void content_mapnode_init()
                f->setAllTextures("[noalpha:leaves.png");
        }
        f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAPLING)+" 1";
-       f->extra_dug_item_rarity = 10;
+       f->extra_dug_item_rarity = 20;
        f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        setWoodLikeDiggingProperties(f->digging_properties, 0.15);
 

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index a07f4cac897b95cc1f15786201c40e37230b7da1..9a7c7ba9020ff3e610dc5071800b6bc6f2ce7b46 100644 (file)
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -80,7 +80,7 @@ static s16 find_ground_level_clever(VoxelManipulator &vmanip, v2s16 p2d)
 }
 #endif
 
-static void make_tree(VoxelManipulator &vmanip, v3s16 p0, bool is_apple_tree)
+void make_tree(ManualMapVoxelManipulator &vmanip, v3s16 p0, bool is_apple_tree)
 {
        MapNode treenode(CONTENT_TREE);
        MapNode leavesnode(CONTENT_LEAVES);