From 20b0ad736c3ab81b28a84fb1fb8ae7c99a794749 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Wed, 1 Nov 2023 23:43:12 +0100
Subject: Core/Gossip: Rename and document text id field in SMSG_GOSSIP_MESSAGE
 to include classic differences

---
 src/server/game/Entities/Creature/GossipDef.cpp | 2 +-
 src/server/game/Server/Packets/NPCPackets.cpp   | 6 +++---
 src/server/game/Server/Packets/NPCPackets.h     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp
index ac46ffd3b2a..142b379770c 100644
--- a/src/server/game/Entities/Creature/GossipDef.cpp
+++ b/src/server/game/Entities/Creature/GossipDef.cpp
@@ -249,7 +249,7 @@ void PlayerMenu::SendGossipMenu(uint32 titleTextId, ObjectGuid objectGUID)
         packet.FriendshipFactionID = addon->FriendshipFactionID;
 
     if (NpcText const* text = sObjectMgr->GetNpcText(titleTextId))
-        packet.TextID = Trinity::Containers::SelectRandomWeightedContainerElement(text->Data, [](NpcTextData const& data) { return data.Probability; })->BroadcastTextID;
+        packet.BroadcastTextID = Trinity::Containers::SelectRandomWeightedContainerElement(text->Data, [](NpcTextData const& data) { return data.Probability; })->BroadcastTextID;
 
     packet.GossipOptions.reserve(_gossipMenu.GetMenuItems().size());
     for (GossipMenuItem const& item : _gossipMenu.GetMenuItems())
diff --git a/src/server/game/Server/Packets/NPCPackets.cpp b/src/server/game/Server/Packets/NPCPackets.cpp
index f78e75e20a4..e7b4c3b2f11 100644
--- a/src/server/game/Server/Packets/NPCPackets.cpp
+++ b/src/server/game/Server/Packets/NPCPackets.cpp
@@ -109,7 +109,7 @@ WorldPacket const* GossipMessage::Write()
     _worldPacket << uint32(GossipOptions.size());
     _worldPacket << uint32(GossipText.size());
     _worldPacket.WriteBit(TextID.has_value());
-    _worldPacket.WriteBit(TextID2.has_value());
+    _worldPacket.WriteBit(BroadcastTextID.has_value());
     _worldPacket.FlushBits();
 
     for (ClientGossipOptions const& options : GossipOptions)
@@ -118,8 +118,8 @@ WorldPacket const* GossipMessage::Write()
     if (TextID)
         _worldPacket << int32(*TextID);
 
-    if (TextID2)
-        _worldPacket << int32(*TextID2);
+    if (BroadcastTextID)
+        _worldPacket << int32(*BroadcastTextID);
 
     for (ClientGossipText const& text : GossipText)
         _worldPacket << text;
diff --git a/src/server/game/Server/Packets/NPCPackets.h b/src/server/game/Server/Packets/NPCPackets.h
index f57880ba0e4..7d0369c7070 100644
--- a/src/server/game/Server/Packets/NPCPackets.h
+++ b/src/server/game/Server/Packets/NPCPackets.h
@@ -116,8 +116,8 @@ namespace WorldPackets
             int32 FriendshipFactionID = 0;
             ObjectGuid GossipGUID;
             std::vector<ClientGossipText> GossipText;
-            Optional<int32> TextID;
-            Optional<int32> TextID2;
+            Optional<int32> TextID;             // in classic variants this still holds npc_text id
+            Optional<int32> BroadcastTextID;
             int32 GossipID = 0;
         };
 
-- 
cgit v1.2.3