diff options
| author | Kaelima <kaelima@live.se> | 2012-01-12 20:43:57 -0800 |
|---|---|---|
| committer | Kaelima <kaelima@live.se> | 2012-01-12 20:43:57 -0800 |
| commit | 4d82b0824a0ef925916b9584874073b9d780013e (patch) | |
| tree | ee474bc68da763f0ae77be3e8d255cf3f1a05a4e | |
| parent | 73a291c31032b5503cce393b5da18f97a1b6b301 (diff) | |
| parent | db00c5f29b9d2a31b24b0314bb692f6c9f0f53dd (diff) | |
Merge pull request #4796 from Gyx/4.x
Gyx 4.x update
| -rw-r--r-- | src/server/game/Server/Protocol/Opcodes.cpp | 4 | ||||
| -rwxr-xr-x | src/server/game/Server/Protocol/Opcodes.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 2bbd47e2b52..d7d4a999393 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -236,7 +236,7 @@ void InitOpcodes() DEFINE_OPCODE_HANDLER(CMSG_OPEN_ITEM, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleOpenItemOpcode ); DEFINE_OPCODE_HANDLER(CMSG_READ_ITEM, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleReadItem ); DEFINE_OPCODE_HANDLER(SMSG_READ_ITEM_OK, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - //DEFINE_OPCODE_HANDLER(SMSG_READ_ITEM_FAILED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); + DEFINE_OPCODE_HANDLER(SMSG_READ_ITEM_FAILED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //DEFINE_OPCODE_HANDLER(SMSG_ITEM_COOLDOWN, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); DEFINE_OPCODE_HANDLER(CMSG_GAMEOBJ_USE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGameObjectUseOpcode ); //DEFINE_OPCODE_HANDLER(CMSG_DESTROY_ITEMS, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); @@ -369,7 +369,7 @@ void InitOpcodes() DEFINE_OPCODE_HANDLER(SMSG_SPELL_START, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); DEFINE_OPCODE_HANDLER(SMSG_SPELL_GO, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); DEFINE_OPCODE_HANDLER(SMSG_SPELL_FAILURE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - //DEFINE_OPCODE_HANDLER(SMSG_SPELL_COOLDOWN, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); + DEFINE_OPCODE_HANDLER(SMSG_SPELL_COOLDOWN, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //DEFINE_OPCODE_HANDLER(SMSG_COOLDOWN_EVENT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); DEFINE_OPCODE_HANDLER(CMSG_CANCEL_AURA, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleCancelAuraOpcode ); //DEFINE_OPCODE_HANDLER(SMSG_EQUIPMENT_SET_SAVED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index 314b21f4d5a..2bb9f88b617 100755 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -922,7 +922,7 @@ enum Opcodes SMSG_RAID_INSTANCE_INFO = 0x00, SMSG_RAID_INSTANCE_MESSAGE = 0xD862, SMSG_RANDOMIZE_CHAR_NAME = 0xF0DC, - SMSG_READ_ITEM_FAILED = 0x00, + SMSG_READ_ITEM_FAILED = 0xC5B, SMSG_READ_ITEM_OK = 0x9ECE, SMSG_REALM_SPLIT = 0x1AF2, SMSG_REAL_GROUP_UPDATE = 0x4C56, @@ -967,7 +967,7 @@ enum Opcodes SMSG_SPELLNONMELEEDAMAGELOG = 0x5CCF, SMSG_SPELLORDAMAGE_IMMUNE = 0x48FA, SMSG_SPELLSTEALLOG = 0x00, - SMSG_SPELL_COOLDOWN = 0x00, + SMSG_SPELL_COOLDOWN = 0x88D6, SMSG_SPELL_DELAYED = 0x00, SMSG_SPELL_FAILED_OTHER = 0xCE4A, SMSG_SPELL_FAILURE = 0x9A66, |