From 99891604f61e8d7c2341650f9ac2505ad8ea10c7 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Tue, 3 Jan 2023 21:13:49 +0100 Subject: [PATCH] Core/Packets: fixed linux builds --- src/server/game/Entities/Creature/GossipDef.cpp | 2 +- src/server/game/Server/Packets/NPCPackets.cpp | 4 ++-- src/server/game/Server/Packets/NPCPackets.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp index 26bd703879..4f447a59ec 100644 --- a/src/server/game/Entities/Creature/GossipDef.cpp +++ b/src/server/game/Entities/Creature/GossipDef.cpp @@ -211,7 +211,7 @@ void PlayerMenu::SendGossipMenu(uint32 titleTextId, ObjectGuid objectGUID) gossipMessage.GossipOptions.reserve(_gossipMenu.GetMenuItems().size()); for (auto const& itr : _gossipMenu.GetMenuItems()) { - WorldPackets::NPC::GossipOptions& option = gossipMessage.GossipOptions.emplace_back(); + WorldPackets::NPC::SGossipOptions& option = gossipMessage.GossipOptions.emplace_back(); option.ClientOption = itr.first; option.OptionNPC = itr.second.MenuItemIcon; option.OptionFlags = itr.second.IsCoded; // makes pop up box password diff --git a/src/server/game/Server/Packets/NPCPackets.cpp b/src/server/game/Server/Packets/NPCPackets.cpp index d7fd8baca3..14e5d4cdc1 100644 --- a/src/server/game/Server/Packets/NPCPackets.cpp +++ b/src/server/game/Server/Packets/NPCPackets.cpp @@ -132,7 +132,7 @@ WorldPacket const* WorldPackets::NPC::VendorInventory::Write() return &_worldPacket; } -ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::NPC::GossipOptions const& gossipOption) +ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::NPC::SGossipOptions const& gossipOption) { data << int32(gossipOption.ClientOption); data << uint8(gossipOption.OptionNPC); @@ -163,7 +163,7 @@ WorldPacket const* WorldPackets::NPC::GossipMessage::Write() _worldPacket << uint32(TextID); _worldPacket << uint32(GossipOptions.size()); - for (WorldPackets::NPC::GossipOptions const& gossipOption : GossipOptions) + for (WorldPackets::NPC::SGossipOptions const& gossipOption : GossipOptions) _worldPacket << gossipOption; _worldPacket << uint32(GossipQuestText.size()); diff --git a/src/server/game/Server/Packets/NPCPackets.h b/src/server/game/Server/Packets/NPCPackets.h index df4cd82f4d..5493908826 100644 --- a/src/server/game/Server/Packets/NPCPackets.h +++ b/src/server/game/Server/Packets/NPCPackets.h @@ -141,7 +141,7 @@ namespace WorldPackets bool Repeatable = false; }; - struct GossipOptions + struct SGossipOptions { int32 ClientOption = 0; int32 OptionCost = 0; @@ -161,7 +161,7 @@ namespace WorldPackets ObjectGuid GossipGUID; int32 TextID = 0; int32 GossipID = 0; - std::vector GossipOptions; + std::vector GossipOptions; std::vector GossipQuestText; }; }