Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4923 from DrakeFish/4x_2

Browse Source 
4.x - Fixed channels support.
This commit is contained in:
Nay
2012-01-22 17:50:25 -08:00
parent 76b4b3f177 2940c169e0
commit 785ee217f7
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Server/Protocol/Handlers/ChatHandler.cpp
View File

@@ -270,8 +270,8 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData)
recvData >> to;
break;
case CHAT_MSG_CHANNEL:
recvData >> channel;
recvData >> msg;
recvData >> channel;
break;
case CHAT_MSG_AFK:
case CHAT_MSG_DND:

8
src/server/game/Server/Protocol/Opcodes.cpp
View File

@@ -213,11 +213,11 @@ void InitOpcodes()
DEFINE_OPCODE_HANDLER(CMSG_MESSAGECHAT_YELL, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode );
DEFINE_OPCODE_HANDLER(SMSG_MESSAGECHAT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
DEFINE_OPCODE_HANDLER(CMSG_JOIN_CHANNEL, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleJoinChannel );
//DEFINE_OPCODE_HANDLER(CMSG_LEAVE_CHANNEL, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLeaveChannel );
DEFINE_OPCODE_HANDLER(CMSG_LEAVE_CHANNEL, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLeaveChannel );
DEFINE_OPCODE_HANDLER(SMSG_CHANNEL_NOTIFY, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(CMSG_CHANNEL_LIST, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleChannelList );
DEFINE_OPCODE_HANDLER(CMSG_CHANNEL_LIST, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleChannelList );
DEFINE_OPCODE_HANDLER(SMSG_CHANNEL_LIST, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(CMSG_CHANNEL_PASSWORD, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleChannelPassword );
DEFINE_OPCODE_HANDLER(CMSG_CHANNEL_PASSWORD, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleChannelPassword );
DEFINE_OPCODE_HANDLER(CMSG_CHANNEL_SET_OWNER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleChannelSetOwner );
//DEFINE_OPCODE_HANDLER(CMSG_CHANNEL_OWNER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleChannelOwner );
DEFINE_OPCODE_HANDLER(CMSG_CHANNEL_MODERATOR, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleChannelModerator );
@@ -1070,7 +1070,7 @@ void InitOpcodes()
//DEFINE_OPCODE_HANDLER(CMSG_GUILD_BANK_DEPOSIT_MONEY, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildBankDepositMoney );
//DEFINE_OPCODE_HANDLER(CMSG_GUILD_BANK_WITHDRAW_MONEY, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildBankWithdrawMoney );
DEFINE_OPCODE_HANDLER(MSG_GUILD_BANK_LOG_QUERY, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildBankLogQuery );
//DEFINE_OPCODE_HANDLER(CMSG_SET_CHANNEL_WATCH, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetChannelWatch );
DEFINE_OPCODE_HANDLER(CMSG_SET_CHANNEL_WATCH, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetChannelWatch );
//DEFINE_OPCODE_HANDLER(SMSG_USERLIST_ADD, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(SMSG_USERLIST_REMOVE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );
//DEFINE_OPCODE_HANDLER(SMSG_USERLIST_UPDATE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide );

8
src/server/game/Server/Protocol/Opcodes.h
View File

@@ -113,11 +113,11 @@ enum Opcodes
CMSG_CHANNEL_DISPLAY_LIST = 0x00,
CMSG_CHANNEL_INVITE = 0x7451,
CMSG_CHANNEL_KICK = 0x3049,
CMSG_CHANNEL_LIST = 0x00,
CMSG_CHANNEL_LIST = 0x64D9,
CMSG_CHANNEL_MODERATOR = 0x20D1,
CMSG_CHANNEL_MUTE = 0x34C9,
CMSG_CHANNEL_OWNER = 0x00,
CMSG_CHANNEL_PASSWORD = 0x00,
CMSG_CHANNEL_PASSWORD = 0x30D1,
CMSG_CHANNEL_ROSTER_INFO = 0x00,
CMSG_CHANNEL_SET_OWNER = 0x7449,
CMSG_CHANNEL_UNBAN = 0x6451,
@@ -238,7 +238,7 @@ enum Opcodes
CMSG_LEARN_PREVIEW_TALENTS_PET = 0x9AFB,
CMSG_LEARN_TALENT = 0x98F3,
CMSG_LEAVE_BATTLEFIELD = 0x1AE7,
CMSG_LEAVE_CHANNEL = 0x00,
CMSG_LEAVE_CHANNEL = 0x60C9,
CMSG_LFG_GET_PLAYER_INFO = 0x00,
CMSG_LFG_JOIN = 0x00,
CMSG_LFG_LEAVE = 0x00,
@@ -401,7 +401,7 @@ enum Opcodes
CMSG_SET_ACTIVE_VOICE_CHANNEL = 0x00,
CMSG_SET_ALLOW_LOW_LEVEL_RAID1 = 0xC863,
CMSG_SET_ALLOW_LOW_LEVEL_RAID2 = 0x4CE7,
CMSG_SET_CHANNEL_WATCH = 0x00,
CMSG_SET_CHANNEL_WATCH = 0x9CFB,
CMSG_SET_CONTACT_NOTES = 0x1AF3,
CMSG_SET_FACTION_CHEAT = 0x00,
CMSG_SET_GUILD_BANK_TEXT = 0x00,