aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2014-12-27 22:35:05 -0500
committerkwolekr <kwolekr@minetest.net>2014-12-27 22:35:05 -0500
commitae2721f2c84183cea4e447009a59ce606601702e (patch)
treec9a99296ca8cdec998568eb62c102005367e304d /src
parent08d259cf41db805ada7c39a39ffe9dcec4f0c230 (diff)
downloadminetest-ae2721f2c84183cea4e447009a59ce606601702e.tar.gz
minetest-ae2721f2c84183cea4e447009a59ce606601702e.tar.bz2
minetest-ae2721f2c84183cea4e447009a59ce606601702e.zip
VoxelManipulator: Remove unnecessary deallocation steps
Diffstat (limited to 'src')
-rw-r--r--src/voxel.cpp16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/voxel.cpp b/src/voxel.cpp
index bd14acb06..1299a5296 100644
--- 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;
}
@@ -215,10 +209,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;
}