From bdc34c46aaa6b3e25a634c077976bb089a5cfd76 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 8 Feb 2020 18:11:28 +0100 Subject: Core/PacketIO: Name unknown field in SMSG_FEATURE_SYSTEM_STATUS --- src/server/game/Handlers/CharacterHandler.cpp | 1 + src/server/game/Server/Packets/SystemPackets.cpp | 4 ++-- src/server/game/Server/Packets/SystemPackets.h | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 2d99031f2bc..2b5fe7123d9 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -1191,6 +1191,7 @@ void WorldSession::SendFeatureSystemStatus() features.CharUndeleteEnabled = sWorld->getBoolConfig(CONFIG_FEATURE_SYSTEM_CHARACTER_UNDELETE_ENABLED); features.BpayStoreEnabled = sWorld->getBoolConfig(CONFIG_FEATURE_SYSTEM_BPAY_STORE_ENABLED); + features.IsMuted = !CanSpeak(); SendPacket(features.Write()); } diff --git a/src/server/game/Server/Packets/SystemPackets.cpp b/src/server/game/Server/Packets/SystemPackets.cpp index e31e551c37f..d2a8de6f1fa 100644 --- a/src/server/game/Server/Packets/SystemPackets.cpp +++ b/src/server/game/Server/Packets/SystemPackets.cpp @@ -75,7 +75,7 @@ WorldPacket const* WorldPackets::System::FeatureSystemStatus::Write() _worldPacket.WriteBit(VoiceChatDisabledByParentalControl); _worldPacket.WriteBit(VoiceChatMutedByParentalControl); _worldPacket.WriteBit(QuestSessionEnabled); - _worldPacket.WriteBit(Unused825); + _worldPacket.WriteBit(IsMuted); _worldPacket.WriteBit(ClubFinderEnabled); _worldPacket.FlushBits(); @@ -121,7 +121,7 @@ WorldPacket const* WorldPackets::System::FeatureSystemStatus::Write() } { - _worldPacket.WriteBit(VoiceChatManagerSettings.Enabled); + _worldPacket.WriteBit(VoiceChatManagerSettings.IsSquelched); _worldPacket << VoiceChatManagerSettings.BnetAccountGuid; _worldPacket << VoiceChatManagerSettings.GuildGuid; } diff --git a/src/server/game/Server/Packets/SystemPackets.h b/src/server/game/Server/Packets/SystemPackets.h index d88cb3d48a0..9f19cb5ab8c 100644 --- a/src/server/game/Server/Packets/SystemPackets.h +++ b/src/server/game/Server/Packets/SystemPackets.h @@ -83,7 +83,7 @@ namespace WorldPackets struct VoiceChatProxySettings { - bool Enabled = false; + bool IsSquelched = false; ObjectGuid BnetAccountGuid; ObjectGuid GuildGuid; }; @@ -142,7 +142,7 @@ namespace WorldPackets bool VoiceChatDisabledByParentalControl = false; bool VoiceChatMutedByParentalControl = false; bool QuestSessionEnabled = false; - bool Unused825 = false; + bool IsMuted = false; bool ClubFinderEnabled = false; Optional> RaceClassExpansionLevels; -- cgit v1.2.3