mojotrollz/mojo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* fixed channels for 2.2.3

Browse Source
This commit is contained in:
False.Genesis 2007-11-03 13:36:52 +00:00
parent 0aed2ee895
commit 6cf1b2cf96
1 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/Client/World/Channel.cpp
View File

@ -40,11 +40,34 @@ enum NotifyTypes
UNKNOWN6 = 0x20 // You are in not the correct area for this channel. UNKNOWN6 = 0x20 // You are in not the correct area for this channel.
}; };
enum PlayerChannelModes enum ChannelFlags
{ {
// 0x01 = ?? CHANNEL_FLAG_CUSTOM = 0x01,
MODERATOR = 0x02, // 0x02
MUTED = 0x04 CHANNEL_FLAG_TRADE = 0x04,
CHANNEL_FLAG_NOT_LFG = 0x08,
CHANNEL_FLAG_GENERAL = 0x10,
CHANNEL_FLAG_CITY = 0x20,
CHANNEL_FLAG_LFG = 0x40,
CHANNEL_FLAG_VOICE = 0x80
// General 0x18 = 0x10 | 0x08
// Trade 0x3C = 0x20 | 0x10 | 0x08 | 0x04
// LocalDefence 0x18 = 0x10 | 0x08
// GuildRecruitment 0x38 = 0x20 | 0x10 | 0x08
// LookingForGroup 0x50 = 0x40 | 0x10
};
enum ChannelMemberFlags
{
MEMBER_FLAG_NONE = 0x00,
MEMBER_FLAG_OWNER = 0x01,
MEMBER_FLAG_MODERATOR = 0x02,
MEMBER_FLAG_VOICED = 0x04,
MEMBER_FLAG_MUTED = 0x08,
MEMBER_FLAG_CUSTOM = 0x10,
MEMBER_FLAG_MIC_MUTED = 0x20,
// 0x40
// 0x80
}; };
typedef std::map<uint64,uint8> ChannelPlayerList; typedef std::map<uint64,uint8> ChannelPlayerList;
@ -58,7 +81,9 @@ void Channel::Join(std::string channel, std::string password)
// Send join channel request // Send join channel request
WorldPacket worldPacket; WorldPacket worldPacket;
worldPacket.SetOpcode(CMSG_JOIN_CHANNEL); worldPacket.SetOpcode(CMSG_JOIN_CHANNEL);
worldPacket << (uint32)0 << (uint8)0; // new since 2.0.x // uint32: some channel ID? server answers us with that number later if channel joined worldPacket << (uint32)0; // new since 2.0.x, some channel ID? server answers us with that number later if channel joined
worldPacket << (uint8)0; // unk
worldPacket << (uint8)0; // unk, new since 2.2.x
worldPacket << channel << password; worldPacket << channel << password;
_worldSession->SendWorldPacket(worldPacket); _worldSession->SendWorldPacket(worldPacket);
} }
@ -72,7 +97,7 @@ void Channel::Leave(std::string channel)
// Send leave channel request // Send leave channel request
WorldPacket worldPacket; WorldPacket worldPacket;
worldPacket.SetOpcode(CMSG_LEAVE_CHANNEL); worldPacket.SetOpcode(CMSG_LEAVE_CHANNEL);
worldPacket << (uint32)0; // new since 2.0.x worldPacket << (uint32)0; // new since 2.0.x, maybe channel id
worldPacket << channel; worldPacket << channel;
_worldSession->SendWorldPacket(worldPacket); _worldSession->SendWorldPacket(worldPacket);
return; return;
@ -193,8 +218,9 @@ void Channel::HandleListRequest(WorldPacket& recvPacket)
uint8 unk; uint8 unk;
uint32 size; uint32 size;
uint64 guid; uint64 guid;
uint8 mode; uint8 mode, flags; // mode: player flags; flags: channel flags
recvPacket >> unk >> size; std::string name;
recvPacket >> unk >> name >> flags >> size;
// store list of GUIDs in: @ChannelList // store list of GUIDs in: @ChannelList
DefList *l = _worldSession->GetInstance()->GetScripts()->lists.Get("@ChannelList"); DefList *l = _worldSession->GetInstance()->GetScripts()->lists.Get("@ChannelList");
@ -218,8 +244,8 @@ void Channel::HandleListRequest(WorldPacket& recvPacket)
pname="<unknown>"; pname="<unknown>";
_worldSession->SendQueryPlayerName(i->first); _worldSession->SendQueryPlayerName(i->first);
} }
muted = mode & MUTED; muted = mode & MEMBER_FLAG_MUTED;
mod = mode & MODERATOR; mod = mode & MEMBER_FLAG_MODERATOR;
while(pname.length()<12) while(pname.length()<12)
pname += " "; // for better formatting pname += " "; // for better formatting