Fix usage of destroyed mutex

[minetest.git] / src / voxel.cpp

diff --git a/src/voxel.cpp b/src/voxel.cpp
index e6d4bdcd22587d5bad6895f61e337f8df029f9bf..a5e0b09fe7517ce334050a29fa7259329021289a 100644 (file)
--- a/src/voxel.cpp
+++ b/src/voxel.cpp
@@ -46,21 +46,15 @@ VoxelManipulator::VoxelManipulator():
 VoxelManipulator::~VoxelManipulator()
 {
        clear();
-       if(m_data)
-               delete[] m_data;
-       if(m_flags)
-               delete[] m_flags;
 }
 
 void VoxelManipulator::clear()
 {
        // Reset area to volume=0
        m_area = VoxelArea();
-       if(m_data)
-               delete[] m_data;
+       delete[] m_data;
        m_data = NULL;
-       if(m_flags)
-               delete[] m_flags;
+       delete[] m_flags;
        m_flags = NULL;
 }
 
@@ -145,7 +139,7 @@ void VoxelManipulator::print(std::ostream &o, INodeDefManager *ndef,
 void VoxelManipulator::addArea(const VoxelArea &area)
 {
        // Cancel if requested area has zero volume
-       if(area.getExtent() == v3s16(0,0,0))
+       if (area.hasEmptyExtent())
                return;
 
        // Cancel if m_area already contains the requested area
@@ -157,7 +151,7 @@ void VoxelManipulator::addArea(const VoxelArea &area)
        // Calculate new area
        VoxelArea new_area;
        // New area is the requested area if m_area has zero volume
-       if(m_area.getExtent() == v3s16(0,0,0))
+       if(m_area.hasEmptyExtent())
        {
                new_area = area;
        }
@@ -179,7 +173,7 @@ void VoxelManipulator::addArea(const VoxelArea &area)
        dstream<<", new_size="<<new_size;
        dstream<<std::endl;*/
 
-       // Allocate and clear new data
+       // Allocate new data and clear flags
        MapNode *new_data = new MapNode[new_size];
        assert(new_data);
        u8 *new_flags = new u8[new_size];
@@ -213,10 +207,8 @@ void VoxelManipulator::addArea(const VoxelArea &area)
        m_data = new_data;
        m_flags = new_flags;
 
-       if(old_data)
-               delete[] old_data;
-       if(old_flags)
-               delete[] old_flags;
+       delete[] old_data;
+       delete[] old_flags;
 
        //dstream<<"addArea done"<<std::endl;
 }
@@ -420,7 +412,7 @@ void VoxelManipulator::unspreadLight(enum LightBank bank,
                std::map<v3s16, u8> & from_nodes,
                std::set<v3s16> & light_sources, INodeDefManager *nodemgr)
 {
-       if(from_nodes.size() == 0)
+       if(from_nodes.empty())
                return;
 
        for(std::map<v3s16, u8>::iterator j = from_nodes.begin();
@@ -629,6 +621,8 @@ void VoxelManipulator::spreadLight(enum LightBank bank,
 }
 #endif
 
+const MapNode VoxelManipulator::ContentIgnoreNode = MapNode(CONTENT_IGNORE);
+
 #if 1
 /*
        Lights neighbors of from_nodes, collects all them and then
@@ -646,7 +640,7 @@ void VoxelManipulator::spreadLight(enum LightBank bank,
                v3s16(-1,0,0), // left
        };
 
-       if(from_nodes.size() == 0)
+       if(from_nodes.empty())
                return;
 
        std::set<v3s16> lighted_nodes;
@@ -719,7 +713,7 @@ void VoxelManipulator::spreadLight(enum LightBank bank,
                        <<" for "<<from_nodes.size()<<" nodes"
                        <<std::endl;*/
 
-       if(lighted_nodes.size() > 0)
+       if(!lighted_nodes.empty())
                spreadLight(bank, lighted_nodes, nodemgr);
 }
 #endif