summaryrefslogtreecommitdiff
path: root/src/mapgen.cpp
diff options
context:
space:
mode:
authorMark Holmquist <marktraceur@gmail.com>2011-09-23 18:19:47 -0700
committerMark Holmquist <marktraceur@gmail.com>2011-09-23 18:19:47 -0700
commitbc01ae4cbd6e9ba2bcc0b75bab8ba5d99fcc4e34 (patch)
treec339a2873afc2050e7d9dcb8579601206ca07460 /src/mapgen.cpp
parent319f43e6d2d59b6062b3643b8cb26f4153cbc750 (diff)
downloadminetest-bc01ae4cbd6e9ba2bcc0b75bab8ba5d99fcc4e34.tar.gz
minetest-bc01ae4cbd6e9ba2bcc0b75bab8ba5d99fcc4e34.tar.bz2
minetest-bc01ae4cbd6e9ba2bcc0b75bab8ba5d99fcc4e34.zip
Fixed merge issues with saplings, ready to pull now!
Diffstat (limited to 'src/mapgen.cpp')
-rw-r--r--src/mapgen.cpp2
1 files changed, 1 insertions, 1 deletions
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);