aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Handlers/GroupHandler.cpp4
-rw-r--r--src/server/game/Server/Protocol/Opcodes.cpp2
-rwxr-xr-xsrc/server/game/Server/Protocol/Opcodes.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp
index 7d99213acf0..3d919335e1a 100755
--- a/src/server/game/Handlers/GroupHandler.cpp
+++ b/src/server/game/Handlers/GroupHandler.cpp
@@ -710,7 +710,7 @@ void WorldSession::HandlePartyAssignmentOpcode(WorldPacket & recv_data)
void WorldSession::HandleRaidReadyCheckOpcode(WorldPacket & recv_data)
{
- sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received SMSG_RAID_READY_CHECK");
+ sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received MSG_RAID_READY_CHECK");
Group* group = GetPlayer()->GetGroup();
if (!group)
@@ -724,7 +724,7 @@ void WorldSession::HandleRaidReadyCheckOpcode(WorldPacket & recv_data)
/********************/
// everything's fine, do it
- WorldPacket data(SMSG_RAID_READY_CHECK, 8);
+ WorldPacket data(MSG_RAID_READY_CHECK, 8);
data << GetPlayer()->GetGUID();
group->BroadcastPacket(&data, false, -1);
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index e5cdc7da4b4..4ed8f90b10e 100644
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -862,7 +862,7 @@ void InitOpcodes()
//DEFINE_OPCODE_HANDLER(SMSG_INSTANCE_RESET_FAILED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
DEFINE_OPCODE_HANDLER(SMSG_UPDATE_LAST_INSTANCE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
DEFINE_OPCODE_HANDLER(MSG_RAID_TARGET_UPDATE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRaidTargetUpdateOpcode );
- DEFINE_OPCODE_HANDLER(SMSG_RAID_READY_CHECK, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRaidReadyCheckOpcode );
+ DEFINE_OPCODE_HANDLER(MSG_RAID_READY_CHECK, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRaidReadyCheckOpcode );
//DEFINE_OPCODE_HANDLER(CMSG_LUA_USAGE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL );
DEFINE_OPCODE_HANDLER(SMSG_PET_ACTION_SOUND, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
DEFINE_OPCODE_HANDLER(SMSG_PET_DISMISS_SOUND, 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 3714218540c..6f5e9f588f6 100755
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -524,7 +524,8 @@ enum Opcodes
MSG_QUERY_GUILD_BANK_TEXT = 0x8CCF,
MSG_QUERY_NEXT_MAIL_TIME = 0xCEE6,
MSG_QUEST_PUSH_RESULT = 0x1863,
- MSG_RAID_READY_CHECK_CONFIRM = 0x584E,
+ MSG_RAID_READY_CHECK = 0x584E,
+ MSG_RAID_READY_CHECK_CONFIRM = 0x00,
MSG_RAID_READY_CHECK_FINISHED = 0x00,
MSG_RAID_TARGET_UPDATE = 0x1E5F,
MSG_RANDOM_ROLL = 0x4C57,
@@ -961,7 +962,6 @@ enum Opcodes
SMSG_RAID_GROUP_ONLY = 0xDCDB,
SMSG_RAID_INSTANCE_INFO = 0x4ACA,
SMSG_RAID_INSTANCE_MESSAGE = 0xD862,
- SMSG_RAID_READY_CHECK = 0x584E,
SMSG_RANDOMIZE_CHAR_NAME = 0xF0DC,
SMSG_READ_ITEM_FAILED = 0x0C5B,
SMSG_READ_ITEM_OK = 0x9ECE,