aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Globals/ObjectMgr.cpp
diff options
context:
space:
mode:
authorMachiavelli <none@none>2010-06-21 23:20:58 +0200
committerMachiavelli <none@none>2010-06-21 23:20:58 +0200
commit95ddfbd9e266690d305de077c16d7212a91be69b (patch)
tree98ee594de26daee35839ead3748c95c7e1f6e77a /src/server/game/Globals/ObjectMgr.cpp
parent5c86cc2aee955ce80b0d365561f2a87cc43fe024 (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/Globals/ObjectMgr.cpp')
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp2
1 files changed, 1 insertions, 1 deletions
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;