diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2014-10-25 15:41:42 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-10-25 15:42:16 +0100 |
| commit | f37e5b9afd6b9d45afaf2c951d4fac0b72832865 (patch) | |
| tree | 79e76963809a2bc512dd3ef43056fb106816dae3 /src/server/game/Movement | |
| parent | c67fa90f3e4afd95141546676a959e89d2ac73ef (diff) | |
Core/Opcodes: Support opcodes with the same ids and different direction
- Split enum Opcodes in enum OpcodeMisc/OpcodeClient/OpcodeServer
- Old MSGs are temporarly in the enum OpcodeClient
- Split _internalTable of OpcodeTable in two tables, one for CMSG opcodes and another for SMSG opcodes
Note: most added static_cast<OpcodeX> will be removed once WorldPacket
is split in two classes (ServerPacket/ClientPacket, see #13434)
Diffstat (limited to 'src/server/game/Movement')
| -rw-r--r-- | src/server/game/Movement/MovementStructures.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Movement/MovementStructures.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Movement/MovementStructures.cpp b/src/server/game/Movement/MovementStructures.cpp index 1c67bf1a6cc..93e940f0e64 100644 --- a/src/server/game/Movement/MovementStructures.cpp +++ b/src/server/game/Movement/MovementStructures.cpp @@ -5192,7 +5192,7 @@ bool Movement::PrintInvalidSequenceElement(MovementStatusElements const element, return false; } -Movement::PacketSender::PacketSender(Unit* unit, Opcodes serverControl, Opcodes playerControl, Opcodes broadcast /*= SMSG_PLAYER_MOVE*/, ExtraMovementStatusElement* extras /*= NULL*/) +Movement::PacketSender::PacketSender(Unit* unit, OpcodeServer serverControl, OpcodeServer playerControl, OpcodeServer broadcast /*= SMSG_PLAYER_MOVE*/, ExtraMovementStatusElement* extras /*= NULL*/) : _extraElements(extras), _unit(unit) { if (unit->GetTypeId() == TYPEID_PLAYER && unit->ToPlayer()->m_mover->GetTypeId() == TYPEID_PLAYER) @@ -5202,7 +5202,7 @@ Movement::PacketSender::PacketSender(Unit* unit, Opcodes serverControl, Opcodes } else { - _selfOpcode = NULL_OPCODE; + _selfOpcode = static_cast<OpcodeServer>(NULL_OPCODE); _broadcast = serverControl; } } @@ -5233,7 +5233,7 @@ void Movement::PacketSender::Send() const } } -MovementStatusElements const* GetMovementStatusElementsSequence(Opcodes opcode) +MovementStatusElements const* GetMovementStatusElementsSequence(uint32 opcode) { switch (opcode) { diff --git a/src/server/game/Movement/MovementStructures.h b/src/server/game/Movement/MovementStructures.h index 278eaa877fa..d348d08b415 100644 --- a/src/server/game/Movement/MovementStructures.h +++ b/src/server/game/Movement/MovementStructures.h @@ -139,20 +139,20 @@ namespace Movement class PacketSender { public: - PacketSender(Unit* unit, Opcodes serverControl, Opcodes playerControl, Opcodes broadcast = SMSG_PLAYER_MOVE, ExtraMovementStatusElement* extras = NULL); + PacketSender(Unit* unit, OpcodeServer serverControl, OpcodeServer playerControl, OpcodeServer broadcast = SMSG_PLAYER_MOVE, ExtraMovementStatusElement* extras = NULL); void Send() const; private: ExtraMovementStatusElement* _extraElements; Unit* _unit; - Opcodes _selfOpcode; - Opcodes _broadcast; + OpcodeServer _selfOpcode; + OpcodeServer _broadcast; }; bool PrintInvalidSequenceElement(MovementStatusElements element, char const* function); } -MovementStatusElements const* GetMovementStatusElementsSequence(Opcodes opcode); +MovementStatusElements const* GetMovementStatusElementsSequence(uint32 opcode); #endif |
