Fix map delete on windows (concatenate paths correctly with / or \ depending on OS)

[minetest.git] / src / voxel.cpp

diff --git a/src/voxel.cpp b/src/voxel.cpp
index f60b641f1af7954e3d9fd9cdab1c555d562ab946..616a197e3abfdd79afc77ac2417201d36f596da8 100644 (file)
--- a/src/voxel.cpp
+++ b/src/voxel.cpp
@@ -19,10 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "voxel.h"
 #include "map.h"
-
-// For TimeTaker
-#include "utility.h"
+#include "utility.h" // For TimeTaker
 #include "gettime.h"
+#include "content_mapnode.h"
 
 /*
        Debug stuff
@@ -94,7 +93,7 @@ void VoxelManipulator::print(std::ostream &o, VoxelPrintMode mode)
                                else
                                {
                                        c = 'X';
-                                       u8 m = m_data[m_area.index(x,y,z)].d;
+                                       content_t m = m_data[m_area.index(x,y,z)].getContent();
                                        u8 pr = m_data[m_area.index(x,y,z)].param2;
                                        if(mode == VOXELPRINT_MATERIAL)
                                        {