diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-13 17:24:37 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-13 17:24:37 +0100 |
| commit | 528b9d4f7d11c71665bb7de9923c5167bfe0b6f4 (patch) | |
| tree | 4917dae7b06d18dd9de7577cad5992ee9ee595f3 /src/server/game/Guilds/Guild.cpp | |
| parent | ed1ece2bb78d6e473872ff1691343295cd573309 (diff) | |
| parent | f03e650474463ad7454294e0fb5d6f169719ecbd (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/Entities/Item/ItemPrototype.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/shared/Packets/ByteBuffer.h
Diffstat (limited to 'src/server/game/Guilds/Guild.cpp')
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 23003fdf367..a7ff2c75309 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -1304,7 +1304,7 @@ void Guild::HandleRoster(WorldSession* session /*= NULL*/) data.WriteString(m_motd); data << uint32(m_accountsNumber); data << uint32(sWorld->getIntConfig(CONFIG_GUILD_WEEKLY_REP_CAP)); - data << uint32(secsToTimeBitFields(m_createdDate)); + data.AppendPackedTime(m_createdDate); data << uint32(0); if (session) @@ -3345,7 +3345,7 @@ void Guild::GuildNewsLog::BuildNewsData(uint32 id, GuildNewsEntry& guildNew, Wor data << uint32(id); data << uint32(guildNew.EventType); - data << uint32(secsToTimeBitFields(guildNew.Date)); + data.AppendPackedTime(guildNew.Date); } void Guild::GuildNewsLog::BuildNewsData(WorldPacket& data) @@ -3389,6 +3389,6 @@ void Guild::GuildNewsLog::BuildNewsData(WorldPacket& data) data << uint32(it->first); data << uint32(it->second.EventType); - data << uint32(secsToTimeBitFields(it->second.Date)); + data.AppendPackedTime(it->second.Date); } } |