diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-06-27 06:56:26 -0700 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-06-27 06:56:26 -0700 |
| commit | 1c90f9fc2eba43be71f9d49dad75c5d0514d4e50 (patch) | |
| tree | 63c1116ff43936475874b54d171c7e08556d54ee /src/voxel.h | |
| parent | 158b054e72582005d895f1ed0e1cb0c9b22a8e57 (diff) | |
| parent | 7efe89ff584b2c0338dcede4c1e08504d0158780 (diff) | |
| download | minetest-1c90f9fc2eba43be71f9d49dad75c5d0514d4e50.tar.gz minetest-1c90f9fc2eba43be71f9d49dad75c5d0514d4e50.tar.bz2 minetest-1c90f9fc2eba43be71f9d49dad75c5d0514d4e50.zip | |
Merge pull request #13 from Bahamada/upstream_merge
Upstream merge
Diffstat (limited to 'src/voxel.h')
| -rw-r--r-- | src/voxel.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/voxel.h b/src/voxel.h index 2e8015eb1..6d1a318f1 100644 --- a/src/voxel.h +++ b/src/voxel.h @@ -384,6 +384,14 @@ public: return m_data[m_area.index(p)]; } + MapNode getNodeNoExNoEmerge(v3s16 p) + { + if(m_area.contains(p) == false) + return MapNode(CONTENT_IGNORE); + if(m_flags[m_area.index(p)] & VOXELFLAG_INEXISTENT) + return MapNode(CONTENT_IGNORE); + return m_data[m_area.index(p)]; + } MapNode & getNodeRef(v3s16 p) { emerge(p); |