utility.h: Change Buffer's interface to be more compatible with SharedBuffer's interf...

[oweals/minetest.git] / src / voxel.h

diff --git a/src/voxel.h b/src/voxel.h
index 5d45ab183e7dd310f30f06eeb6e0453d5bc51c1a..51df18299af620401c58f09e6a466ef32c278e99 100644 (file)
--- 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);
@@ -445,12 +453,14 @@ public:
                if(m_area.contains(p) == false)
                        return false;
                m_data[m_area.index(p)] = n;
+               return true;
        }
        bool setNodeNoEmerge(s32 i, MapNode n)
        {
                if(m_area.contains(i) == false)
                        return false;
                m_data[i] = n;
+               return true;
        }
        /*bool setContentNoEmerge(v3s16 p, u8 c)
        {
@@ -553,7 +563,7 @@ public:
        /*
                Some settings
        */
-       bool m_disable_water_climb;
+       //bool m_disable_water_climb;
 
 private:
 };