diff options
Diffstat (limited to 'src')
19 files changed, 47 insertions, 94 deletions
diff --git a/src/server/collision/Management/VMapFactory.cpp b/src/server/collision/Management/VMapFactory.cpp index 331acbace47..561bf0dfa02 100644 --- a/src/server/collision/Management/VMapFactory.cpp +++ b/src/server/collision/Management/VMapFactory.cpp @@ -122,15 +122,10 @@ namespace VMAP // delete all internal data structures void VMapFactory::clear() { - if(iIgnoreSpellIds) - { - delete iIgnoreSpellIds; - iIgnoreSpellIds = NULL; - } - if(gVMapManager) - { - delete gVMapManager; - gVMapManager = NULL; - } + delete iIgnoreSpellIds; + iIgnoreSpellIds = NULL; + + delete gVMapManager; + gVMapManager = NULL; } } diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp index d7ebfbf912e..009a4483f83 100644 --- a/src/server/game/Chat/Commands/Level3.cpp +++ b/src/server/game/Chat/Commands/Level3.cpp @@ -795,24 +795,21 @@ bool ChatHandler::HandleReloadCreatureTemplateCommand(const char* args) size_t len = 0; if (const char* temp = fields[9].GetString()) { - if (cInfo->Name) - delete cInfo->Name; + delete[] cInfo->Name; len = strlen(temp)+1; const_cast<CreatureInfo*>(cInfo)->Name = new char[len]; strncpy(cInfo->Name, temp, len); } if (const char* temp = fields[10].GetString()) { - if (cInfo->SubName) - delete cInfo->SubName; + delete[] cInfo->SubName; len = strlen(temp)+1; const_cast<CreatureInfo*>(cInfo)->SubName = new char[len]; strncpy(cInfo->SubName, temp, len); } if (const char* temp = fields[11].GetString()) { - if (cInfo->IconName) - delete cInfo->IconName; + delete[] cInfo->IconName; len = strlen(temp)+1; const_cast<CreatureInfo*>(cInfo)->IconName = new char[len]; strncpy(cInfo->IconName, temp, len); @@ -871,8 +868,7 @@ bool ChatHandler::HandleReloadCreatureTemplateCommand(const char* args) const_cast<CreatureInfo*>(cInfo)->maxgold = fields[63].GetUInt32(); if (const char* temp = fields[64].GetString()) { - if (cInfo->AIName) - delete cInfo->AIName; + delete[] cInfo->AIName; len = strlen(temp)+1; const_cast<CreatureInfo*>(cInfo)->AIName = new char[len]; strncpy(const_cast<char*>(cInfo->AIName), temp, len); diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index 928b9f4f9e6..a64887a724f 100644 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -235,8 +235,8 @@ inline void LoadDBC(uint32& availableDbcLocales,barGoLink& bar, StoreProblemList else errlist.push_back(dbc_filename); } - if (sql) - delete sql; + + delete sql; } void LoadDBCStores(const std::string& dataPath) diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 734c5522942..1a2c9c9767c 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -46,8 +46,7 @@ LFGQueue::~LFGQueue() void LFGQueue::AddToQueue(uint64 guid, LfgQueueInfo* pqInfo) { - if (LfgQueueInfo* qInfo = m_LfgQueue[guid]) - delete qInfo; + delete m_LfgQueue[guid]; m_LfgQueue[guid] = pqInfo; // ATM will only add it to the queue... No find group implementation... yet (on purpose) } diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index c9c9775c04a..62300e43a39 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -171,11 +171,8 @@ Creature::~Creature() { m_vendorItemCounts.clear(); - if (i_AI) - { - delete i_AI; - i_AI = NULL; - } + delete i_AI; + i_AI = NULL; //if (m_uint32Values) // sLog.outError("Deconstruct Creature Entry = %u", GetEntry()); @@ -721,7 +718,7 @@ bool Creature::AIM_Initialize(CreatureAI* ai) Motion_Initialize(); i_AI = ai ? ai : FactorySelector::selectAI(this); - if (oldAI) delete oldAI; + delete oldAI; IsAIEnabled = true; i_AI->InitializeAI(); return true; diff --git a/src/server/game/Entities/Item/Container/Bag.cpp b/src/server/game/Entities/Item/Container/Bag.cpp index b38bcb54ff8..12fd9efee28 100644 --- a/src/server/game/Entities/Item/Container/Bag.cpp +++ b/src/server/game/Entities/Item/Container/Bag.cpp @@ -117,11 +117,8 @@ bool Bag::LoadFromDB(uint32 guid, uint64 owner_guid, QueryResult_AutoPtr result) for (uint8 i = 0; i < MAX_BAG_SIZE; ++i) { SetUInt64Value(CONTAINER_FIELD_SLOT_1 + (i*2), 0); - if (m_bagslot[i]) - { - delete m_bagslot[i]; - m_bagslot[i] = NULL; - } + delete m_bagslot[i]; + m_bagslot[i] = NULL; } return true; diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 5be2639bc3e..38356bf8034 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -113,13 +113,9 @@ Object::~Object() ObjectAccessor::Instance().RemoveUpdateObject(this); } - if (m_uint32Values) - { - //DEBUG_LOG("Object desctr 1 check (%p)",(void*)this); - delete [] m_uint32Values; - delete [] m_uint32Values_mirror; - //DEBUG_LOG("Object desctr 2 check (%p)",(void*)this); - } + delete [] m_uint32Values; + delete [] m_uint32Values_mirror; + } void Object::_InitValues() diff --git a/src/server/game/Entities/Object/Updates/UpdateMask.h b/src/server/game/Entities/Object/Updates/UpdateMask.h index 527bec42aa7..a18a044ee33 100644 --- a/src/server/game/Entities/Object/Updates/UpdateMask.h +++ b/src/server/game/Entities/Object/Updates/UpdateMask.h @@ -32,8 +32,7 @@ class UpdateMask ~UpdateMask() { - if (mUpdateMask) - delete [] mUpdateMask; + delete [] mUpdateMask; } void SetBit (uint32 index) @@ -58,8 +57,7 @@ class UpdateMask void SetCount (uint32 valuesCount) { - if (mUpdateMask) - delete [] mUpdateMask; + delete [] mUpdateMask; mCount = valuesCount; mBlocks = (valuesCount + 31) / 32; diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 51f5d43c3d8..ed4bd4d6f96 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -324,9 +324,7 @@ bool Pet::LoadPetFromDB(Player* owner, uint32 petentry, uint32 petnumber, bool c if (result) { - if (m_declinedname) - delete m_declinedname; - + delete m_declinedname; m_declinedname = new DeclinedName; Field *fields2 = result->Fetch(); for (uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index a6dc7ab137e..f7e70a60b9d 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -514,10 +514,7 @@ Player::~Player () // Note: buy back item already deleted from DB when player was saved for (uint8 i = 0; i < PLAYER_SLOTS_COUNT; ++i) - { - if (m_items[i]) - delete m_items[i]; - } + delete m_items[i]; for (PlayerSpellMap::const_iterator itr = m_spells.begin(); itr != m_spells.end(); ++itr) delete itr->second; @@ -539,8 +536,7 @@ Player::~Player () delete PlayerTalkClass; for (size_t x = 0; x < ItemSetEff.size(); x++) - if (ItemSetEff[x]) - delete ItemSetEff[x]; + delete ItemSetEff[x]; delete m_declinedname; delete m_runes; @@ -15565,9 +15561,7 @@ void Player::_LoadDeclinedNames(QueryResult_AutoPtr result) if (!result) return; - if (m_declinedname) - delete m_declinedname; - + delete m_declinedname; m_declinedname = new DeclinedName; Field *fields = result->Fetch(); for (uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i) @@ -15817,11 +15811,8 @@ bool Player::LoadFromDB(uint32 guid, SqlQueryHolder *holder) SetUInt64Value(PLAYER_FIELD_INV_SLOT_HEAD + (slot * 2), 0); SetVisibleItemSlot(slot, NULL); - if (m_items[slot]) - { - delete m_items[slot]; - m_items[slot] = NULL; - } + delete m_items[slot]; + m_items[slot] = NULL; } sLog.outDebug("Load Basic value of player %s is: ", m_name.c_str()); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index fa745edcb7a..58361e19ea4 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -201,10 +201,8 @@ Unit::~Unit() RemoveAllDynObjects(); _DeleteRemovedAuras(); - if (m_charmInfo) - delete m_charmInfo; - if (m_vehicleKit) - delete m_vehicleKit; + delete m_charmInfo; + delete m_vehicleKit; assert(!m_attacking); assert(m_attackers.empty()); @@ -13297,8 +13295,7 @@ void Unit::UpdateCharmAI() { if (!isCharmed()) { - if (i_AI) - delete i_AI; + delete i_AI; i_AI = i_disabledAI; i_disabledAI = NULL; } diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index d616806a7cc..9f2aeebd16e 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -3419,7 +3419,7 @@ void ObjectMgr::LoadGuilds() !newGuild->LoadMembersFromDB(guildMembersResult) || !newGuild->LoadBankRightsFromDB(guildBankTabRightsResult) || !newGuild->CheckGuildStructure() -) + ) { newGuild->Disband(); delete newGuild; diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index f5840e2c287..95912f21f10 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -79,8 +79,7 @@ Group::~Group() itr2->second.save->RemoveGroup(this); // Sub group counters clean up - if (m_subGroupsCounts) - delete[] m_subGroupsCounts; + delete[] m_subGroupsCounts; } bool Group::Create(const uint64 &guid, const char * name) 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() diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index 0b76eb9b41e..ac4900a0fd3 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -120,8 +120,7 @@ m_LastPingTime(ACE_Time_Value::zero) WorldSocket::~WorldSocket (void) { - if (m_RecvWPct) - delete m_RecvWPct; + delete m_RecvWPct; if (m_OutBuffer) m_OutBuffer->release(); diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp index 0996d873ffa..6ccb30b64ef 100644 --- a/src/server/game/Server/WorldSocketMgr.cpp +++ b/src/server/game/Server/WorldSocketMgr.cpp @@ -84,8 +84,7 @@ class ReactorRunnable : protected ACE_Task_Base Stop(); Wait(); - if (m_Reactor) - delete m_Reactor; + delete m_Reactor; } void Stop() @@ -220,11 +219,8 @@ WorldSocketMgr::WorldSocketMgr() : WorldSocketMgr::~WorldSocketMgr() { - if (m_NetThreads) - delete [] m_NetThreads; - - if (m_Acceptor) - delete m_Acceptor; + delete [] m_NetThreads; + delete m_Acceptor; } int diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 9256228ad18..1b485e416e4 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -387,8 +387,7 @@ AuraEffect::AuraEffect(Aura * base, uint8 effIndex, int32 *baseAmount, Unit * ca AuraEffect::~AuraEffect() { - if (m_spellmod) - delete m_spellmod; + delete m_spellmod; } void AuraEffect::GetTargetList(std::list<Unit *> & targetList) const diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index c4aeca15a13..b3d0f3a3b12 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -342,8 +342,7 @@ Aura::~Aura() { // free effects memory for (uint8 i = 0 ; i < MAX_SPELL_EFFECTS; ++i) - if (m_effects[i]) - delete m_effects[i]; + delete m_effects[i]; assert(m_applications.empty()); _DeleteRemovedApplications(); diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 4da78277c96..3b3f1bf4e06 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -142,7 +142,7 @@ World::~World() VMAP::VMapFactory::clear(); - if (m_resultQueue) delete m_resultQueue; + delete m_resultQueue; //TODO free addSessQueue } |