From 597b39e5614f0993dc8f6a3fbae8c55fa5d80b05 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Fri, 2 Feb 2024 14:40:35 -0500 Subject: [PATCH] Core/Gossip: Rename and document text id field in SMSG_GOSSIP_MESSAGE to include classic differences Port From (https://github.com/TrinityCore/TrinityCore/commit/20b0ad736c3ab81b28a84fb1fb8ae7c99a794749) --- Source/Game/Entities/Creature/Gossip.cs | 2 +- Source/Game/Networking/Packets/NPCPackets.cs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Game/Entities/Creature/Gossip.cs b/Source/Game/Entities/Creature/Gossip.cs index efaf611c6..75e69dc77 100644 --- a/Source/Game/Entities/Creature/Gossip.cs +++ b/Source/Game/Entities/Creature/Gossip.cs @@ -249,7 +249,7 @@ namespace Game.Misc NpcText text = Global.ObjectMgr.GetNpcText(titleTextId); if (text != null) - packet.TextID = (int)text.Data.SelectRandomElementByWeight(data => data.Probability).BroadcastTextID; + packet.BroadcastTextID = (int)text.Data.SelectRandomElementByWeight(data => data.Probability).BroadcastTextID; foreach (var (index, item) in _gossipMenu.GetMenuItems()) { diff --git a/Source/Game/Networking/Packets/NPCPackets.cs b/Source/Game/Networking/Packets/NPCPackets.cs index 6d4df7d56..b0cf09352 100644 --- a/Source/Game/Networking/Packets/NPCPackets.cs +++ b/Source/Game/Networking/Packets/NPCPackets.cs @@ -58,7 +58,7 @@ namespace Game.Networking.Packets _worldPacket.WriteInt32(GossipOptions.Count); _worldPacket.WriteInt32(GossipText.Count); _worldPacket.WriteBit(TextID.HasValue); - _worldPacket.WriteBit(TextID2.HasValue); + _worldPacket.WriteBit(BroadcastTextID.HasValue); _worldPacket.FlushBits(); foreach (ClientGossipOptions options in GossipOptions) @@ -67,8 +67,8 @@ namespace Game.Networking.Packets if (TextID.HasValue) _worldPacket.WriteInt32(TextID.Value); - if (TextID2.HasValue) - _worldPacket.WriteInt32(TextID2.Value); + if (BroadcastTextID.HasValue) + _worldPacket.WriteInt32(BroadcastTextID.Value); foreach (ClientGossipText text in GossipText) text.Write(_worldPacket); @@ -78,8 +78,8 @@ namespace Game.Networking.Packets public int FriendshipFactionID; public ObjectGuid GossipGUID; public List GossipText = new(); - public int? TextID; - public int? TextID2; + public int? TextID; // in classic variants this still holds npc_text id + public int? BroadcastTextID; public uint GossipID; }