diff options
| author | Machiavelli <none@none> | 2010-06-21 23:20:58 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2010-06-21 23:20:58 +0200 |
| commit | 95ddfbd9e266690d305de077c16d7212a91be69b (patch) | |
| tree | 98ee594de26daee35839ead3748c95c7e1f6e77a /src/server/game/Maps/Map.cpp | |
| parent | 5c86cc2aee955ce80b0d365561f2a87cc43fe024 (diff) | |
Remove some redundant explicit NULL checks for pointers before ´delete´ or ´delete[]´ calls since this check is done implicitly when deleting.
Also fixes a memory leak in .reload creature_template command
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index afc18cba971..a0656bee38c 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -1241,11 +1241,11 @@ bool GridMap::loadData(char *filename) void GridMap::unloadData() { - if (m_area_map) delete[] m_area_map; - if (m_V9) delete[] m_V9; - if (m_V8) delete[] m_V8; - if (m_liquid_type) delete[] m_liquid_type; - if (m_liquid_map) delete[] m_liquid_map; + delete[] m_area_map; + delete[] m_V9; + delete[] m_V8; + delete[] m_liquid_type; + delete[] m_liquid_map; m_area_map = NULL; m_V9 = NULL; m_V8 = NULL; @@ -2350,11 +2350,8 @@ InstanceMap::InstanceMap(uint32 id, time_t expiry, uint32 InstanceId, uint8 Spaw InstanceMap::~InstanceMap() { - if (i_data) - { - delete i_data; - i_data = NULL; - } + delete i_data; + i_data = NULL; } void InstanceMap::InitVisibilityDistance() |