minenux
/
minetest-engine-minetest
1
0
Fork 0
Code Pull Requests Releases Activity

Mgv6: Fix taiga, allow pine tree spawning on snowblocks

pull/2563/merge
paramat 2015-04-12 05:11:16 +01:00
parent 75cbd80e5b
commit a5f942c3c0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mapgen_v6.cpp
View File

@ -944,13 +944,14 @@ void MapgenV6::placeTreesAndJungleGrass()
continue; continue;
v3s16 p(x, y, z); v3s16 p(x, y, z);
// Trees grow only on mud and grass // Trees grow only on mud and grass and snowblock
{ {
u32 i = vm->m_area.index(p); u32 i = vm->m_area.index(p);
content_t c = vm->m_data[i].getContent(); content_t c = vm->m_data[i].getContent();
if (c != c_dirt && if (c != c_dirt &&
c != c_dirt_with_grass && c != c_dirt_with_grass &&
c != c_dirt_with_snow) c != c_dirt_with_snow &&
c != c_snowblock)
continue; continue;
} }
p.Y++; p.Y++;
@ -959,7 +960,7 @@ void MapgenV6::placeTreesAndJungleGrass()
if (bt == BT_JUNGLE) { if (bt == BT_JUNGLE) {
treegen::make_jungletree(*vm, p, ndef, myrand()); treegen::make_jungletree(*vm, p, ndef, myrand());
} else if (bt == BT_TAIGA) { } else if (bt == BT_TAIGA) {
treegen::make_pine_tree(*vm, p, ndef, myrand()); treegen::make_pine_tree(*vm, p - v3s16(0, 1, 0), ndef, myrand());
} else if (bt == BT_NORMAL) { } else if (bt == BT_NORMAL) {
bool is_apple_tree = (myrand_range(0, 3) == 0) && bool is_apple_tree = (myrand_range(0, 3) == 0) &&
getHaveAppleTree(v2s16(x, z)); getHaveAppleTree(v2s16(x, z));