X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fvoxel.h;h=6d1a318f1e9b9f505d1a849d150806664cc67b14;hb=416499f9787e48549a344f19eeac7ecfec517ecf;hp=5d45ab183e7dd310f30f06eeb6e0453d5bc51c1a;hpb=e0f7bd4d57bf0c9b497c4d0bb73f7bd4d5cc0643;p=dragonfireclient.git

diff --git a/src/voxel.h b/src/voxel.h
index 5d45ab183..6d1a318f1 100644
--- a/src/voxel.h
+++ b/src/voxel.h
@@ -384,6 +384,14 @@ class VoxelManipulator /*: public NodeContainer*/
 
 		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);
@@ -553,7 +561,7 @@ class VoxelManipulator /*: public NodeContainer*/
 	/*
 		Some settings
 	*/
-	bool m_disable_water_climb;
+	//bool m_disable_water_climb;
 
 private:
 };