diff options
| author | Shauren <shauren.trinity@gmail.com> | 2012-01-30 15:28:38 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2012-01-30 15:28:38 +0100 |
| commit | 6089d4642bac381a25348c227b6c5ab3e86834f3 (patch) | |
| tree | 2cb6c054f365a1c8e0e9862728b72be5c4971a32 /src/server/game/Server/Protocol | |
| parent | 7575ba38981ea0748700f408249eee6bb69530c1 (diff) | |
Core/Protocol: Resolved conflicing opcodes MSG_TALENT_WIPE_CONFIRM and CMSG_VERIFY_CONNECTIVITY_RESPONSE
Diffstat (limited to 'src/server/game/Server/Protocol')
| -rw-r--r-- | src/server/game/Server/Protocol/Opcodes.cpp | 3 | ||||
| -rwxr-xr-x | src/server/game/Server/Protocol/Opcodes.h | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 3b202a159ec..c7b889c864f 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -1375,8 +1375,7 @@ void InitOpcodes() //DEFINE_OPCODE_HANDLER(SMSG_COMMENTATOR_SKIRMISH_QUEUE_RESULT1, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //DEFINE_OPCODE_HANDLER(SMSG_COMMENTATOR_SKIRMISH_QUEUE_RESULT2, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //DEFINE_OPCODE_HANDLER(SMSG_COMPRESSED_UNKNOWN_1310, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - DEFINE_OPCODE_HANDLER(SMSG_VERIFY_CONNECTIVITY, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - DEFINE_OPCODE_HANDLER(CMSG_VERIFY_CONNECTIVITY_RESPONSE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_EarlyProccess ); + DEFINE_OPCODE_HANDLER(MSG_VERIFY_CONNECTIVITY, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_EarlyProccess ); //DEFINE_OPCODE_HANDLER(CMSG_LOG_DISCONNECT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_EarlyProccess ); DEFINE_OPCODE_HANDLER(CMSG_RETURN_TO_GRAVEYARD, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleReturnToGraveyard ); DEFINE_OPCODE_HANDLER(CMSG_RANDOMIZE_CHAR_NAME, STATUS_AUTHED, PROCESS_THREADUNSAFE, &WorldSession::HandleRandomizeCharNameOpcode ); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index 8f9761c3b7c..070aed33ebd 100755 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -456,7 +456,6 @@ enum Opcodes CMSG_UPDATE_ACCOUNT_DATA = 0x4AFE, CMSG_UPDATE_PROJECTILE_POSITION = 0xEDB, CMSG_USE_ITEM = 0xD8EA, - CMSG_VERIFY_CONNECTIVITY_RESPONSE = 0x4C52, CMSG_VIOLENCE_LEVEL = 0x00, CMSG_VOICE_SESSION_ENABLE = 0x00, CMSG_WARDEN_DATA = 0x5847, @@ -533,7 +532,8 @@ enum Opcodes MSG_SET_DUNGEON_DIFFICULTY = 0x0C4F, MSG_SET_RAID_DIFFICULTY = 0x1A5A, MSG_TABARDVENDOR_ACTIVATE = 0x98EB, - MSG_TALENT_WIPE_CONFIRM = 0x4C52, //duplicate of CMSG_VERIFY_CONNECTIVITY_RESPONSE + MSG_TALENT_WIPE_CONFIRM = 0x4C52, + MSG_VERIFY_CONNECTIVITY = 0x4F57, SMSG_ACCOUNT_DATA_TIMES = 0x5EE2, SMSG_ACHIEVEMENT_DELETED = 0x9ED2, SMSG_ACHIEVEMENT_EARNED = 0x484E, @@ -1063,7 +1063,6 @@ enum Opcodes SMSG_USERLIST_ADD = 0x4CEE, SMSG_USERLIST_REMOVE = 0x9A6B, SMSG_USERLIST_UPDATE = 0x4A4B, - SMSG_VERIFY_CONNECTIVITY = 0x4F57, SMSG_VOICE_CHAT_STATUS = 0x9ADF, SMSG_VOICE_PARENTAL_CONTROLS = 0x5ADE, SMSG_VOICE_SESSION_LEAVE = 0xCE72, |