From bc01ae4cbd6e9ba2bcc0b75bab8ba5d99fcc4e34 Mon Sep 17 00:00:00 2001
From: Mark Holmquist <marktraceur@gmail.com>
Date: Fri, 23 Sep 2011 18:19:47 -0700
Subject: [PATCH] Fixed merge issues with saplings, ready to pull now!
---
src/content_mapnode.cpp | 2 +-
src/mapgen.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp
index 308397735..af8aa5207 100644
--- 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 a07f4cac8..9a7c7ba90 100644
--- 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);
--
GitLab