aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Guilds
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2014-10-26 02:57:28 +0200
committerShauren <shauren.trinity@gmail.com>2014-10-26 02:57:28 +0200
commit9e1930959db59013d6f0221d29cc652cdf2f6145 (patch)
tree29218cc6af11c18f645eba3503583ed821975b2c /src/server/game/Guilds
parent747350a0bcffaa4ef2b5d3317bb75fac78c64472 (diff)
Core/Entities: Changed object lowguid to uint64
Diffstat (limited to 'src/server/game/Guilds')
-rw-r--r--src/server/game/Guilds/Guild.cpp4
-rw-r--r--src/server/game/Guilds/GuildMgr.cpp20
-rw-r--r--src/server/game/Guilds/GuildMgr.h2
3 files changed, 13 insertions, 13 deletions
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index ac7e25cb2cd..84a466e5001 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -2724,7 +2724,7 @@ bool Guild::AddMember(ObjectGuid guid, uint8 rankId)
{
m_members[guid] = member;
player->SetInGuild(m_id);
- player->SetGuildIdInvited(0);
+ player->SetGuildIdInvited(UI64LIT(0));
player->SetRank(rankId);
player->SetGuildLevel(GetLevel());
SendLoginInfo(player->GetSession());
@@ -2824,7 +2824,7 @@ void Guild::DeleteMember(ObjectGuid guid, bool isDisbanding, bool isKicked, bool
// If player not online data in data field will be loaded from guild tabs no need to update it !!
if (player)
{
- player->SetInGuild(0);
+ player->SetInGuild(UI64LIT(0));
player->SetRank(0);
player->SetGuildLevel(0);
diff --git a/src/server/game/Guilds/GuildMgr.cpp b/src/server/game/Guilds/GuildMgr.cpp
index 7e9f0f78d3b..91d8499cdc9 100644
--- a/src/server/game/Guilds/GuildMgr.cpp
+++ b/src/server/game/Guilds/GuildMgr.cpp
@@ -18,7 +18,7 @@
#include "Common.h"
#include "GuildMgr.h"
-GuildMgr::GuildMgr() : NextGuildId(1)
+GuildMgr::GuildMgr() : NextGuildId(UI64LIT(1))
{ }
GuildMgr::~GuildMgr()
@@ -88,7 +88,7 @@ Guild* GuildMgr::GetGuildByName(const std::string& guildName) const
return NULL;
}
-std::string GuildMgr::GetGuildNameById(uint32 guildId) const
+std::string GuildMgr::GetGuildNameById(ObjectGuid::LowType guildId) const
{
if (Guild* guild = GetGuildById(guildId))
return guild->GetName();
@@ -175,7 +175,7 @@ void GuildMgr::LoadGuilds()
do
{
Field* fields = result->Fetch();
- uint32 guildId = fields[0].GetUInt64();
+ uint64 guildId = fields[0].GetUInt64();
if (Guild* guild = GetGuildById(guildId))
guild->LoadRankFromDB(fields);
@@ -214,7 +214,7 @@ void GuildMgr::LoadGuilds()
do
{
Field* fields = result->Fetch();
- uint32 guildId = fields[0].GetUInt64();
+ uint64 guildId = fields[0].GetUInt64();
if (Guild* guild = GetGuildById(guildId))
guild->LoadMemberFromDB(fields);
@@ -248,7 +248,7 @@ void GuildMgr::LoadGuilds()
do
{
Field* fields = result->Fetch();
- uint32 guildId = fields[0].GetUInt64();
+ uint64 guildId = fields[0].GetUInt64();
if (Guild* guild = GetGuildById(guildId))
guild->LoadBankRightFromDB(fields);
@@ -281,7 +281,7 @@ void GuildMgr::LoadGuilds()
do
{
Field* fields = result->Fetch();
- uint32 guildId = fields[0].GetUInt64();
+ uint64 guildId = fields[0].GetUInt64();
if (Guild* guild = GetGuildById(guildId))
guild->LoadEventLogFromDB(fields);
@@ -315,7 +315,7 @@ void GuildMgr::LoadGuilds()
do
{
Field* fields = result->Fetch();
- uint32 guildId = fields[0].GetUInt64();
+ uint64 guildId = fields[0].GetUInt64();
if (Guild* guild = GetGuildById(guildId))
guild->LoadBankEventLogFromDB(fields);
@@ -346,7 +346,7 @@ void GuildMgr::LoadGuilds()
do
{
Field* fields = result->Fetch();
- uint32 guildId = fields[0].GetUInt64();
+ uint64 guildId = fields[0].GetUInt64();
if (Guild* guild = GetGuildById(guildId))
guild->LoadGuildNewsLogFromDB(fields);
@@ -381,7 +381,7 @@ void GuildMgr::LoadGuilds()
do
{
Field* fields = result->Fetch();
- uint32 guildId = fields[0].GetUInt64();
+ uint64 guildId = fields[0].GetUInt64();
if (Guild* guild = GetGuildById(guildId))
guild->LoadBankTabFromDB(fields);
@@ -417,7 +417,7 @@ void GuildMgr::LoadGuilds()
do
{
Field* fields = result->Fetch();
- uint32 guildId = fields[11].GetUInt64();
+ uint64 guildId = fields[11].GetUInt64();
if (Guild* guild = GetGuildById(guildId))
guild->LoadBankItemFromDB(fields);
diff --git a/src/server/game/Guilds/GuildMgr.h b/src/server/game/Guilds/GuildMgr.h
index c01cc561e58..f91629f04e8 100644
--- a/src/server/game/Guilds/GuildMgr.h
+++ b/src/server/game/Guilds/GuildMgr.h
@@ -37,7 +37,7 @@ public:
Guild* GetGuildById(ObjectGuid::LowType guildId) const;
Guild* GetGuildByGuid(ObjectGuid guid) const;
Guild* GetGuildByName(std::string const& guildName) const;
- std::string GetGuildNameById(uint32 guildId) const;
+ std::string GetGuildNameById(ObjectGuid::LowType guildId) const;
void LoadGuildXpForLevel();
void LoadGuildRewards();