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
This commit is contained in:
Nay committed 2012-09-13 17:24:37 +01:00
commit 528b9d4f7d
30 files changed
+623 -56

No files matched your search

+3 -3
View File
@@ -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);
}
}