Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
# Conflicts: # src/server/game/AI/CoreAI/PetAI.cpp # src/server/game/Battlegrounds/Battleground.cpp # src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp # src/server/game/DungeonFinding/LFGMgr.h # src/server/game/DungeonFinding/LFGQueue.h # src/server/game/Entities/Creature/Creature.h # src/server/game/Entities/Pet/Pet.cpp # src/server/game/Entities/Player/Player.cpp # src/server/game/Entities/Player/Player.h # src/server/game/Entities/Unit/Unit.h # src/server/game/Globals/ObjectMgr.h # src/server/game/Groups/Group.cpp # src/server/game/Groups/Group.h # src/server/game/Guilds/Guild.cpp # src/server/game/Guilds/Guild.h # src/server/game/Handlers/GuildHandler.cpp # src/server/game/Handlers/LFGHandler.cpp # src/server/game/Handlers/MiscHandler.cpp # src/server/game/Handlers/NPCHandler.cpp # src/server/game/Instances/InstanceScript.cpp # src/server/game/Maps/Map.cpp # src/server/game/Maps/Map.h # src/server/game/Maps/ZoneScript.cpp # src/server/game/Server/WorldSession.cpp # src/server/game/Spells/SpellEffects.cpp # src/server/game/Weather/Weather.cpp # src/server/game/Weather/WeatherMgr.cpp # src/server/scripts/Commands/cs_reload.cpp # src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp # src/server/scripts/EasternKingdoms/Deadmines/deadmines.h # src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp # src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp # src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h # src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp # src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h # src/server/scripts/Spells/spell_dk.cpp # src/server/scripts/Spells/spell_druid.cpp # src/server/scripts/Spells/spell_generic.cpp # src/server/scripts/Spells/spell_hunter.cpp # src/server/scripts/Spells/spell_mage.cpp # src/server/scripts/Spells/spell_pet.cpp # src/server/scripts/Spells/spell_shaman.cpp # src/server/scripts/Spells/spell_warrior.cpp
This commit is contained in:
commit
2cfdd3cbe0
1450 files changed
+72503
-36529
No files matched your search
@@ -17,10 +17,24 @@
|
||||
*/
|
||||
|
||||
#include "Opcodes.h"
|
||||
#include "Log.h"
|
||||
#include "WorldSession.h"
|
||||
#include <iomanip>
|
||||
#include <sstream>
|
||||
|
||||
OpcodeTable opcodeTable;
|
||||
|
||||
OpcodeTable::OpcodeTable()
|
||||
{
|
||||
memset(_internalTable, 0, sizeof(_internalTable));
|
||||
}
|
||||
|
||||
OpcodeTable::~OpcodeTable()
|
||||
{
|
||||
for (uint16 i = 0; i < NUM_OPCODE_HANDLERS; ++i)
|
||||
delete _internalTable[i];
|
||||
}
|
||||
|
||||
template<bool isInValidRange, bool isNonZero>
|
||||
void OpcodeTable::ValidateAndSetOpcode(uint16 /*opcode*/, char const* /*name*/, SessionStatus /*status*/, PacketProcessing /*processing*/, pOpcodeHandler /*handler*/)
|
||||
{
|
||||
@@ -30,7 +44,7 @@ void OpcodeTable::ValidateAndSetOpcode(uint16 /*opcode*/, char const* /*name*/,
|
||||
template<>
|
||||
void OpcodeTable::ValidateAndSetOpcode<true, true>(uint16 opcode, char const* name, SessionStatus status, PacketProcessing processing, pOpcodeHandler handler)
|
||||
{
|
||||
if (_internalTable[opcode] != NULL)
|
||||
if (_internalTable[opcode] != nullptr)
|
||||
{
|
||||
TC_LOG_ERROR("network", "Tried to override handler of %s with %s (opcode %u)", opcodeTable[opcode]->Name, name, opcode);
|
||||
return;
|
||||
@@ -1656,4 +1670,29 @@ void OpcodeTable::Initialize()
|
||||
//DEFINE_OPCODE_HANDLER(SMSG_ZONE_MAP, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
|
||||
|
||||
#undef DEFINE_OPCODE_HANDLER
|
||||
};
|
||||
}
|
||||
|
||||
/// Lookup opcode name for human understandable logging
|
||||
std::string GetOpcodeNameForLogging(uint32 id)
|
||||
{
|
||||
uint32 opcode = uint32(id);
|
||||
std::ostringstream ss;
|
||||
ss << '[';
|
||||
|
||||
if (id < UNKNOWN_OPCODE)
|
||||
{
|
||||
if (OpcodeHandler const* handler = opcodeTable[uint32(id) & 0x7FFF])
|
||||
{
|
||||
ss << handler->Name;
|
||||
if (opcode & COMPRESSED_OPCODE_MASK)
|
||||
ss << "_COMPRESSED";
|
||||
}
|
||||
else
|
||||
ss << "UNKNOWN OPCODE";
|
||||
}
|
||||
else
|
||||
ss << "INVALID OPCODE";
|
||||
|
||||
ss << " 0x" << std::hex << std::uppercase << opcode << std::nouppercase << " (" << std::dec << opcode << ")]";
|
||||
return ss.str();
|
||||
}
|
||||
Reference in new issue
Block a user