diff options
| -rw-r--r-- | src/game/Guild.cpp | 8 | ||||
| -rw-r--r-- | src/game/GuildHandler.cpp | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/game/Guild.cpp b/src/game/Guild.cpp index 8e983320522..8e0379904fb 100644 --- a/src/game/Guild.cpp +++ b/src/game/Guild.cpp @@ -44,13 +44,14 @@ Guild::Guild() m_BorderColor = 0; m_BackgroundColor = 0; - m_CreatedDate = time(NULL); + m_CreatedDate = 0; m_GuildBankMoney = 0; m_PurchasedTabs = 0; m_GuildEventLogNextGuid = 0; m_GuildBankEventLogNextGuid_Money = 0; + for (uint8 i = 0; i < GUILD_BANK_MAX_TABS; ++i) m_GuildBankEventLogNextGuid_Item[i] = 0; } @@ -222,16 +223,13 @@ bool Guild::LoadGuildFromDB(QueryResult_AutoPtr guildDataResult) m_BackgroundColor = fields[7].GetUInt32(); GINFO = fields[8].GetCppString(); MOTD = fields[9].GetCppString(); - time_t time = fields[10].GetUInt64(); + m_CreatedDate = fields[10].GetUInt64(); m_GuildBankMoney = fields[11].GetUInt64(); m_PurchasedTabs = fields[12].GetUInt32(); if (m_PurchasedTabs > GUILD_BANK_MAX_TABS) m_PurchasedTabs = GUILD_BANK_MAX_TABS; - if (time > 0) - m_CreatedDate = time; - return true; } diff --git a/src/game/GuildHandler.cpp b/src/game/GuildHandler.cpp index 5f7458fdd41..62ce50e0477 100644 --- a/src/game/GuildHandler.cpp +++ b/src/game/GuildHandler.cpp @@ -240,11 +240,11 @@ void WorldSession::HandleGuildInfoOpcode(WorldPacket& /*recvPacket*/) return; } - WorldPacket data(SMSG_GUILD_INFO, (5*4 + guild->GetName().size() + 1)); + WorldPacket data(SMSG_GUILD_INFO, (guild->GetName().size() + 4 + 4 + 4)); data << guild->GetName(); - data << secsToTimeBitFields(guild->GetCreatedDate()); - data << guild->GetMemberSize(); - data << guild->GetMemberSize(); + data << secsToTimeBitFields(guild->GetCreatedDate()); // 3.x (prev. year + month + day) + data << guild->GetMemberSize(); // char amount + data << guild->GetMemberSize(); // acc amount SendPacket(&data); } |