aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorazazel <none@none>2010-10-19 18:50:50 +0600
committerazazel <none@none>2010-10-19 18:50:50 +0600
commitdb04f1377707094f3d1ffc8df4729f703ebf3abb (patch)
treeabf7776b8ad457d770029a81855c54e9c42f30ea /src
parentb7b65eacf2724a0548f7c9ed34ccef8e649d118c (diff)
Core/Guilds: fixed small logical error when counting total loaded guilds
--HG-- branch : trunk
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Globals/ObjectMgr.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index f4396f68777..2fd33549cdd 100755
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -3739,13 +3739,16 @@ void ObjectMgr::LoadGuilds()
{
barGuilds.step();
Guild* pGuild = *itr;
- if (pGuild && !pGuild->Validate())
+ if (pGuild)
{
- RemoveGuild(pGuild->GetId());
- delete pGuild;
+ if (!pGuild->Validate())
+ {
+ RemoveGuild(pGuild->GetId());
+ delete pGuild;
+ }
+ else
+ ++totalGuilds;
}
- else
- ++totalGuilds;
}
// Cleanup
// Delete orphan guild ranks