diff options
| -rw-r--r-- | src/server/game/Chat/Channels/Channel.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/ChannelPackets.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/ChannelPackets.h | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp index 90c44aa501b..97fa489d388 100644 --- a/src/server/game/Chat/Channels/Channel.cpp +++ b/src/server/game/Chat/Channels/Channel.cpp @@ -995,7 +995,7 @@ void Channel::JoinNotify(Player const* player) { WorldPackets::Channel::UserlistAdd userlistAdd; userlistAdd.AddedUserGUID = guid; - userlistAdd.ChannelFlags = GetFlags(); + userlistAdd._ChannelFlags = GetFlags(); userlistAdd.UserFlags = GetPlayerFlags(guid); userlistAdd.ChannelID = GetChannelId(); userlistAdd.ChannelName = GetName(); @@ -1005,7 +1005,7 @@ void Channel::JoinNotify(Player const* player) { WorldPackets::Channel::UserlistUpdate userlistUpdate; userlistUpdate.UpdatedUserGUID = guid; - userlistUpdate.ChannelFlags = GetFlags(); + userlistUpdate._ChannelFlags = GetFlags(); userlistUpdate.UserFlags = GetPlayerFlags(guid); userlistUpdate.ChannelID = GetChannelId(); userlistUpdate.ChannelName = GetName(); @@ -1018,7 +1018,7 @@ void Channel::LeaveNotify(Player const* player) ObjectGuid const& guid = player->GetGUID(); WorldPackets::Channel::UserlistRemove userlistRemove; userlistRemove.RemovedUserGUID = guid; - userlistRemove.ChannelFlags = GetFlags(); + userlistRemove._ChannelFlags = GetFlags(); userlistRemove.ChannelID = GetChannelId(); userlistRemove.ChannelName = GetName(); diff --git a/src/server/game/Server/Packets/ChannelPackets.cpp b/src/server/game/Server/Packets/ChannelPackets.cpp index c8779052c95..cc6406b81bc 100644 --- a/src/server/game/Server/Packets/ChannelPackets.cpp +++ b/src/server/game/Server/Packets/ChannelPackets.cpp @@ -86,7 +86,7 @@ WorldPacket const* WorldPackets::Channel::ChannelNotifyLeft::Write() WorldPacket const* WorldPackets::Channel::UserlistAdd::Write() { _worldPacket << AddedUserGUID; - _worldPacket << uint8(ChannelFlags); + _worldPacket << uint8(_ChannelFlags); _worldPacket << uint8(UserFlags); _worldPacket << uint32(ChannelID); @@ -101,7 +101,7 @@ WorldPacket const* WorldPackets::Channel::UserlistRemove::Write() { _worldPacket << RemovedUserGUID; - _worldPacket << uint8(ChannelFlags); + _worldPacket << uint8(_ChannelFlags); _worldPacket << uint32(ChannelID); @@ -115,7 +115,7 @@ WorldPacket const* WorldPackets::Channel::UserlistUpdate::Write() { _worldPacket << UpdatedUserGUID; - _worldPacket << uint8(ChannelFlags); + _worldPacket << uint8(_ChannelFlags); _worldPacket << uint8(UserFlags); _worldPacket << uint32(ChannelID); diff --git a/src/server/game/Server/Packets/ChannelPackets.h b/src/server/game/Server/Packets/ChannelPackets.h index 8dba1e84677..7464e9bd391 100644 --- a/src/server/game/Server/Packets/ChannelPackets.h +++ b/src/server/game/Server/Packets/ChannelPackets.h @@ -104,7 +104,7 @@ namespace WorldPackets ObjectGuid AddedUserGUID; - uint8 ChannelFlags = CHANNEL_FLAG_NONE; + uint8 _ChannelFlags = CHANNEL_FLAG_NONE; ///< @see enum ChannelFlags uint8 UserFlags = MEMBER_FLAG_NONE; int32 ChannelID = 0; @@ -121,7 +121,7 @@ namespace WorldPackets ObjectGuid RemovedUserGUID; - uint8 ChannelFlags = CHANNEL_FLAG_NONE; + uint8 _ChannelFlags = CHANNEL_FLAG_NONE; ///< @see enum ChannelFlags uint32 ChannelID = 0; @@ -137,7 +137,7 @@ namespace WorldPackets ObjectGuid UpdatedUserGUID; - uint8 ChannelFlags = CHANNEL_FLAG_NONE; + uint8 _ChannelFlags = CHANNEL_FLAG_NONE; ///< @see enum ChannelFlags uint8 UserFlags = MEMBER_FLAG_NONE; int32 ChannelID = 0; |