diff options
| author | kwolekr <kwolekr@minetest.net> | 2013-03-16 19:37:27 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2013-03-16 19:55:29 -0400 |
| commit | e3badd7062d4bee62335cf100f3f91ef4c370aae (patch) | |
| tree | f2eaf8bff32f741941e39e60364e36b7cbda93d0 /src/treegen.cpp | |
| parent | 6823ce99a7deabe410dd8b143b688cd364490cec (diff) | |
| download | minetest-e3badd7062d4bee62335cf100f3f91ef4c370aae.tar.gz minetest-e3badd7062d4bee62335cf100f3f91ef4c370aae.tar.bz2 minetest-e3badd7062d4bee62335cf100f3f91ef4c370aae.zip | |
Make saplings only grow on dirt or grass, make jungle tree trunks only replace air
Diffstat (limited to 'src/treegen.cpp')
| -rw-r--r-- | src/treegen.cpp | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/src/treegen.cpp b/src/treegen.cpp index 9df528a21..808cf916a 100644 --- a/src/treegen.cpp +++ b/src/treegen.cpp @@ -528,19 +528,27 @@ void make_jungletree(VoxelManipulator &vmanip, v3s16 p0, continue; v3s16 p1 = p0 + v3s16(x,0,z); v3s16 p2 = p0 + v3s16(x,-1,z); - if(vmanip.m_area.contains(p2) - && vmanip.m_data[vmanip.m_area.index(p2)] == CONTENT_AIR) - vmanip.m_data[vmanip.m_area.index(p2)] = treenode; - else if(vmanip.m_area.contains(p1)) - vmanip.m_data[vmanip.m_area.index(p1)] = treenode; + u32 vi1 = vmanip.m_area.index(p1); + u32 vi2 = vmanip.m_area.index(p2); + + if (vmanip.m_area.contains(p2) && + vmanip.m_data[vi2].getContent() == CONTENT_AIR) + vmanip.m_data[vi2] = treenode; + else if (vmanip.m_area.contains(p1) && + vmanip.m_data[vi1].getContent() == CONTENT_AIR) + vmanip.m_data[vi1] = treenode; } + vmanip.m_data[vmanip.m_area.index(p0)] = treenode; s16 trunk_h = pr.range(8, 12); v3s16 p1 = p0; - for(s16 ii=0; ii<trunk_h; ii++) + for (s16 ii=0; ii<trunk_h; ii++) { - if(vmanip.m_area.contains(p1)) - vmanip.m_data[vmanip.m_area.index(p1)] = treenode; + if (vmanip.m_area.contains(p1)) { + u32 vi = vmanip.m_area.index(p1); + if (vmanip.m_data[vi].getContent() == CONTENT_AIR) + vmanip.m_data[vi] = treenode; + } p1.Y++; } @@ -593,8 +601,8 @@ void make_jungletree(VoxelManipulator &vmanip, v3s16 p0, if(vmanip.m_area.contains(p) == false) continue; u32 vi = vmanip.m_area.index(p); - if(vmanip.m_data[vi].getContent() != CONTENT_AIR - && vmanip.m_data[vi].getContent() != CONTENT_IGNORE) + if (vmanip.m_data[vi].getContent() != CONTENT_AIR && + vmanip.m_data[vi].getContent() != CONTENT_IGNORE) continue; u32 i = leaves_a.index(x,y,z); if(leaves_d[i] == 1) |