moparisthebest/minetest
1
0
Fork 0
mirror of https://github.com/moparisthebest/minetest synced 2024-12-24 08:28:49 -05:00
Code Issues Releases Wiki Activity

Fixed merge issues with saplings, ready to pull now!

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/content_mapnode.cpp
View File

@ -243,7 +243,7 @@ void content_mapnode_init()
f->setAllTextures("[noalpha:leaves.png"); f->setAllTextures("[noalpha:leaves.png");
} }
f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAPLING)+" 1"; 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"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
setWoodLikeDiggingProperties(f->digging_properties, 0.15); setWoodLikeDiggingProperties(f->digging_properties, 0.15);

2
src/mapgen.cpp
View File

@ -80,7 +80,7 @@ static s16 find_ground_level_clever(VoxelManipulator &vmanip, v2s16 p2d)
} }
#endif #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 treenode(CONTENT_TREE);
MapNode leavesnode(CONTENT_LEAVES); MapNode leavesnode(CONTENT_LEAVES);