minenux
/
minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

VoxelManipulator: Remove unnecessary deallocation steps

mutilcraft-mt53
kwolekr 2014-12-27 22:35:05 -05:00
parent 08d259cf41
commit ae2721f2c8
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/voxel.cpp
View File

@ -46,20 +46,14 @@ VoxelManipulator::VoxelManipulator():
VoxelManipulator::~VoxelManipulator() VoxelManipulator::~VoxelManipulator()
{ {
clear(); clear();
if(m_data)
delete[] m_data;
if(m_flags)
delete[] m_flags;
} }
void VoxelManipulator::clear() void VoxelManipulator::clear()
{ {
// Reset area to volume=0 // Reset area to volume=0
m_area = VoxelArea(); m_area = VoxelArea();
if(m_data)
delete[] m_data; delete[] m_data;
m_data = NULL; m_data = NULL;
if(m_flags)
delete[] m_flags; delete[] m_flags;
m_flags = NULL; m_flags = NULL;
} }
@ -215,9 +209,7 @@ void VoxelManipulator::addArea(const VoxelArea &area)
m_data = new_data; m_data = new_data;
m_flags = new_flags; m_flags = new_flags;
if(old_data)
delete[] old_data; delete[] old_data;
if(old_flags)
delete[] old_flags; delete[] old_flags;
//dstream<<"addArea done"<<std::endl; //dstream<<"addArea done"<<std::endl;