Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Gossip: Rename and document text id field in SMSG_GOSSIP_MESSAGE to include classic differences

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/20b0ad736c3ab81b28a84fb1fb8ae7c99a794749)
This commit is contained in:
hondacrx
2024-02-02 14:40:35 -05:00
parent a5bc0d0d9b
commit 597b39e561
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Creature/Gossip.cs
+1 -1
View File
@@ -249,7 +249,7 @@ namespace Game.Misc
NpcText text = Global.ObjectMgr.GetNpcText(titleTextId); NpcText text = Global.ObjectMgr.GetNpcText(titleTextId);
if (text != null) 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()) foreach (var (index, item) in _gossipMenu.GetMenuItems())
{ {
Source/Game/Networking/Packets/NPCPackets.cs
+5 -5
View File
@@ -58,7 +58,7 @@ namespace Game.Networking.Packets
_worldPacket.WriteInt32(GossipOptions.Count); _worldPacket.WriteInt32(GossipOptions.Count);
_worldPacket.WriteInt32(GossipText.Count); _worldPacket.WriteInt32(GossipText.Count);
_worldPacket.WriteBit(TextID.HasValue); _worldPacket.WriteBit(TextID.HasValue);
_worldPacket.WriteBit(TextID2.HasValue); _worldPacket.WriteBit(BroadcastTextID.HasValue);
_worldPacket.FlushBits(); _worldPacket.FlushBits();
foreach (ClientGossipOptions options in GossipOptions) foreach (ClientGossipOptions options in GossipOptions)
@@ -67,8 +67,8 @@ namespace Game.Networking.Packets
if (TextID.HasValue) if (TextID.HasValue)
_worldPacket.WriteInt32(TextID.Value); _worldPacket.WriteInt32(TextID.Value);
if (TextID2.HasValue) if (BroadcastTextID.HasValue)
_worldPacket.WriteInt32(TextID2.Value); _worldPacket.WriteInt32(BroadcastTextID.Value);
foreach (ClientGossipText text in GossipText) foreach (ClientGossipText text in GossipText)
text.Write(_worldPacket); text.Write(_worldPacket);
@@ -78,8 +78,8 @@ namespace Game.Networking.Packets
public int FriendshipFactionID; public int FriendshipFactionID;
public ObjectGuid GossipGUID; public ObjectGuid GossipGUID;
public List<ClientGossipText> GossipText = new(); public List<ClientGossipText> GossipText = new();
public int? TextID; public int? TextID; // in classic variants this still holds npc_text id
public int? TextID2; public int? BroadcastTextID;
public uint GossipID; public uint GossipID;
} }