From 532b489ffa33619d381d6b49aa57480e31f731d4 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Fri, 10 Sep 2021 10:24:58 +0200 Subject: [PATCH] Core/Packets: 413a94f4b044c7b88f05c217103110c9a3428273 followup. No longer inline initialize optional members in VendorItem struct --- src/server/game/Server/Packets/NPCPackets.cpp | 2 +- src/server/game/Server/Packets/NPCPackets.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/game/Server/Packets/NPCPackets.cpp b/src/server/game/Server/Packets/NPCPackets.cpp index 2a56cabff60..cf0384b066e 100644 --- a/src/server/game/Server/Packets/NPCPackets.cpp +++ b/src/server/game/Server/Packets/NPCPackets.cpp @@ -77,7 +77,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::NPC::VendorItem const& it data << int32(item.MuID); data << int32(item.Durability); - if (item.ExtendedCostID) + if (item.ExtendedCostID.has_value()) data << uint32(*item.ExtendedCostID); data << uint32(item.ItemID); diff --git a/src/server/game/Server/Packets/NPCPackets.h b/src/server/game/Server/Packets/NPCPackets.h index c2e136ebd54..d60cb5d3704 100644 --- a/src/server/game/Server/Packets/NPCPackets.h +++ b/src/server/game/Server/Packets/NPCPackets.h @@ -115,8 +115,8 @@ namespace WorldPackets uint32 Price = 0; int32 Durability = 0; int32 StackCount = 0; - Optional ExtendedCostID = 0; - Optional PlayerConditionFailed = 0; + Optional ExtendedCostID; + Optional PlayerConditionFailed; }; class VendorInventory final : public ServerPacket