From bc01ae4cbd6e9ba2bcc0b75bab8ba5d99fcc4e34 Mon Sep 17 00:00:00 2001 From: Mark Holmquist Date: Fri, 23 Sep 2011 18:19:47 -0700 Subject: Fixed merge issues with saplings, ready to pull now! --- src/mapgen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mapgen.cpp') 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); -- cgit v1.2.3