1
0
mirror of https://github.com/moparisthebest/minetest synced 2024-12-23 08:08:47 -05:00

Fixed merge issues with saplings, ready to pull now!

This commit is contained in:
Mark Holmquist 2011-09-23 18:19:47 -07:00
parent 319f43e6d2
commit bc01ae4cbd
2 changed files with 2 additions and 2 deletions

View File

@ -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);

View File

@ -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);