Merge branch 'master' into 4.3.4 (Only the Logging System One)
Conflicts: src/server/game/AI/EventAI/CreatureEventAI.cpp src/server/game/AI/EventAI/CreatureEventAIMgr.cpp src/server/game/Achievements/AchievementMgr.cpp src/server/game/Battlegrounds/ArenaTeam.cpp src/server/game/Battlegrounds/BattlegroundMgr.cpp src/server/game/DataStores/DBCStores.cpp src/server/game/Entities/DynamicObject/DynamicObject.cpp src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Object/Updates/UpdateData.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Guilds/Guild.cpp src/server/game/Guilds/GuildMgr.cpp src/server/game/Handlers/AuctionHouseHandler.cpp src/server/game/Handlers/BattleGroundHandler.cpp src/server/game/Handlers/BattlefieldHandler.cpp src/server/game/Handlers/CalendarHandler.cpp src/server/game/Handlers/CharacterHandler.cpp src/server/game/Handlers/ChatHandler.cpp src/server/game/Handlers/GroupHandler.cpp src/server/game/Handlers/GuildHandler.cpp src/server/game/Handlers/ItemHandler.cpp src/server/game/Handlers/MailHandler.cpp src/server/game/Handlers/MiscHandler.cpp src/server/game/Handlers/MovementHandler.cpp src/server/game/Handlers/NPCHandler.cpp src/server/game/Handlers/PetitionsHandler.cpp src/server/game/Handlers/QuestHandler.cpp src/server/game/Handlers/SpellHandler.cpp src/server/game/Handlers/TradeHandler.cpp src/server/game/Instances/InstanceScript.cpp src/server/game/Server/WorldSession.cpp src/server/game/Server/WorldSocket.cpp src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/Auras/SpellAuras.cpp src/server/game/Spells/SpellEffects.cpp src/server/game/Spells/SpellMgr.cpp src/server/game/Tools/PlayerDump.cpp src/server/game/World/World.cpp src/server/scripts/Commands/cs_modify.cpp src/server/scripts/Commands/cs_reload.cpp src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
This commit is contained in:
commit
86afccc8ff
243 files changed
+4510
-4493
No files matched your search
@@ -25,7 +25,7 @@ void WorldPacket::Compress(z_stream* compressionStream)
|
||||
Opcodes uncompressedOpcode = GetOpcode();
|
||||
if (uncompressedOpcode & COMPRESSED_OPCODE_MASK)
|
||||
{
|
||||
sLog->outError(LOG_FILTER_NETWORKIO, "Packet with opcode 0x%04X is already compressed!", uncompressedOpcode);
|
||||
TC_LOG_ERROR(LOG_FILTER_NETWORKIO, "Packet with opcode 0x%04X is already compressed!", uncompressedOpcode);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ void WorldPacket::Compress(z_stream* compressionStream)
|
||||
*this << uint32(size);
|
||||
append(&storage[0], destsize);
|
||||
SetOpcode(opcode);
|
||||
sLog->outInfo(LOG_FILTER_NETWORKIO, "%s (len %u) successfully compressed to %04X (len %u)", GetOpcodeNameForLogging(uncompressedOpcode).c_str(), size, opcode, destsize);
|
||||
TC_LOG_INFO(LOG_FILTER_NETWORKIO, "%s (len %u) successfully compressed to %04X (len %u)", GetOpcodeNameForLogging(uncompressedOpcode).c_str(), size, opcode, destsize);
|
||||
}
|
||||
|
||||
//! Compresses another packet and stores it in self (source left intact)
|
||||
@@ -56,7 +56,7 @@ void WorldPacket::Compress(z_stream* compressionStream, WorldPacket const* sourc
|
||||
Opcodes uncompressedOpcode = source->GetOpcode();
|
||||
if (uncompressedOpcode & COMPRESSED_OPCODE_MASK)
|
||||
{
|
||||
sLog->outError(LOG_FILTER_NETWORKIO, "Packet with opcode 0x%04X is already compressed!", uncompressedOpcode);
|
||||
TC_LOG_ERROR(LOG_FILTER_NETWORKIO, "Packet with opcode 0x%04X is already compressed!", uncompressedOpcode);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -77,7 +77,7 @@ void WorldPacket::Compress(z_stream* compressionStream, WorldPacket const* sourc
|
||||
|
||||
SetOpcode(opcode);
|
||||
|
||||
sLog->outInfo(LOG_FILTER_NETWORKIO, "%s (len %u) successfully compressed to %04X (len %u)", GetOpcodeNameForLogging(uncompressedOpcode).c_str(), size, opcode, destsize);
|
||||
TC_LOG_INFO(LOG_FILTER_NETWORKIO, "%s (len %u) successfully compressed to %04X (len %u)", GetOpcodeNameForLogging(uncompressedOpcode).c_str(), size, opcode, destsize);
|
||||
}
|
||||
|
||||
void WorldPacket::Compress(void* dst, uint32 *dst_size, const void* src, int src_size)
|
||||
@@ -90,14 +90,14 @@ void WorldPacket::Compress(void* dst, uint32 *dst_size, const void* src, int src
|
||||
int32 z_res = deflate(_compressionStream, Z_SYNC_FLUSH);
|
||||
if (z_res != Z_OK)
|
||||
{
|
||||
sLog->outError(LOG_FILTER_NETWORKIO, "Can't compress packet (zlib: deflate) Error code: %i (%s, msg: %s)", z_res, zError(z_res), _compressionStream->msg);
|
||||
TC_LOG_ERROR(LOG_FILTER_NETWORKIO, "Can't compress packet (zlib: deflate) Error code: %i (%s, msg: %s)", z_res, zError(z_res), _compressionStream->msg);
|
||||
*dst_size = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
if (_compressionStream->avail_in != 0)
|
||||
{
|
||||
sLog->outError(LOG_FILTER_NETWORKIO, "Can't compress packet (zlib: deflate not greedy)");
|
||||
TC_LOG_ERROR(LOG_FILTER_NETWORKIO, "Can't compress packet (zlib: deflate not greedy)");
|
||||
*dst_size = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user