diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-25 17:11:35 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-10-25 17:11:35 +0200 |
| commit | 10fb948c409e2e4a68b77b7cfc41c068fcbd0bf4 (patch) | |
| tree | eb6520c7e28aed4ffd660b7af15ce8592e4d30c2 /src/server/game/Guilds | |
| parent | 5eb9fe1ea8653c7ae23e4a8c2fa9f8f3073e032d (diff) | |
Core/Entities: Changed a few lowguid uses to ObjectGuid::LowType
Diffstat (limited to 'src/server/game/Guilds')
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Guilds/GuildMgr.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 77fbf14046b..ac7e25cb2cd 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -2702,10 +2702,10 @@ bool Guild::AddMember(ObjectGuid guid, uint8 rankId) // Player cannot be in guild if (player) { - if (player->GetGuildId() != 0) + if (player->GetGuildId()) return false; } - else if (Player::GetGuildIdFromDB(guid) != 0) + else if (Player::GetGuildIdFromDB(guid)) return false; // Remove all player signs from another petitions diff --git a/src/server/game/Guilds/GuildMgr.cpp b/src/server/game/Guilds/GuildMgr.cpp index 1b247f3717b..7e9f0f78d3b 100644 --- a/src/server/game/Guilds/GuildMgr.cpp +++ b/src/server/game/Guilds/GuildMgr.cpp @@ -43,7 +43,7 @@ void GuildMgr::SaveGuilds() itr->second->SaveToDB(); } -uint32 GuildMgr::GenerateGuildId() +ObjectGuid::LowType GuildMgr::GenerateGuildId() { if (NextGuildId >= 0xFFFFFFFE) { @@ -68,7 +68,7 @@ Guild* GuildMgr::GetGuildByGuid(ObjectGuid guid) const // Full guids are only used when receiving/sending data to client // everywhere else guild id is used if (guid.IsGuild()) - if (uint32 guildId = guid.GetCounter()) + if (ObjectGuid::LowType guildId = guid.GetCounter()) return GetGuildById(guildId); return NULL; |