aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Guilds/GuildMgr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Guilds/GuildMgr.cpp')
-rw-r--r--src/server/game/Guilds/GuildMgr.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Guilds/GuildMgr.cpp b/src/server/game/Guilds/GuildMgr.cpp
index bdb0b7dce52..3277f5bbbae 100644
--- a/src/server/game/Guilds/GuildMgr.cpp
+++ b/src/server/game/Guilds/GuildMgr.cpp
@@ -63,12 +63,12 @@ Guild* GuildMgr::GetGuildById(uint32 guildId) const
return NULL;
}
-Guild* GuildMgr::GetGuildByGuid(uint64 guid) const
+Guild* GuildMgr::GetGuildByGuid(ObjectGuid guid) const
{
// Full guids are only used when receiving/sending data to client
// everywhere else guild id is used
- if (IS_GUILD_GUID(guid))
- if (uint32 guildId = GUID_LOPART(guid))
+ if (guid.IsGuild())
+ if (uint32 guildId = guid.GetCounter())
return GetGuildById(guildId);
return NULL;
@@ -96,7 +96,7 @@ std::string GuildMgr::GetGuildNameById(uint32 guildId) const
return "";
}
-Guild* GuildMgr::GetGuildByLeader(uint64 guid) const
+Guild* GuildMgr::GetGuildByLeader(ObjectGuid guid) const
{
for (GuildContainer::const_iterator itr = GuildStore.begin(); itr != GuildStore.end(); ++itr)
if (itr->second->GetLeaderGUID() == guid)