diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-03-17 18:38:01 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-03-17 18:38:01 +0100 |
| commit | 06cc0754b88fd745da30f98b5fa5f8c56d907414 (patch) | |
| tree | ba7f848ed1eb9d2c8587e5a6df626c1730c514bf /src/server/game/Server | |
| parent | 569f1c9f2a4806948521f4c6eab36d406ba45593 (diff) | |
Core/PacketIO: Updated auction packets to newer build
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/Packets/AuctionHousePackets.cpp | 5 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/AuctionHousePackets.h | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/server/game/Server/Packets/AuctionHousePackets.cpp b/src/server/game/Server/Packets/AuctionHousePackets.cpp index e88108f8091..283978a3b36 100644 --- a/src/server/game/Server/Packets/AuctionHousePackets.cpp +++ b/src/server/game/Server/Packets/AuctionHousePackets.cpp @@ -255,7 +255,7 @@ void AuctionBrowseQuery::Read() _worldPacket >> Offset; _worldPacket >> MinLevel; _worldPacket >> MaxLevel; - _worldPacket >> Filters; + Filters = _worldPacket.read<AuctionHouseFilterMask, uint32>(); KnownPets.resize(_worldPacket.read<uint32>()); _worldPacket >> MaxPetLevel; for (uint8& knownPetMask : KnownPets) @@ -331,7 +331,7 @@ void AuctionListItemsByBucketKey::Read() { _worldPacket >> Auctioneer; _worldPacket >> Offset; - _worldPacket >> Unk; + _worldPacket >> Unknown830; if (_worldPacket.ReadBit()) TaintedBy.emplace(); @@ -525,6 +525,7 @@ WorldPacket const* AuctionCommandResult::Write() _worldPacket << Guid; _worldPacket << uint64(MinIncrement); _worldPacket << uint64(Money); + _worldPacket << uint32(DesiredDelay); return &_worldPacket; } diff --git a/src/server/game/Server/Packets/AuctionHousePackets.h b/src/server/game/Server/Packets/AuctionHousePackets.h index cda691e5cfc..c552305b730 100644 --- a/src/server/game/Server/Packets/AuctionHousePackets.h +++ b/src/server/game/Server/Packets/AuctionHousePackets.h @@ -26,6 +26,7 @@ struct AuctionEntry; enum class AuctionHouseSortOrder : uint8; +enum class AuctionHouseFilterMask : uint32; namespace WorldPackets { @@ -140,7 +141,7 @@ namespace WorldPackets uint32 Offset = 0; uint8 MinLevel = 1; uint8 MaxLevel = MAX_LEVEL; - uint32 Filters = 0; + AuctionHouseFilterMask Filters = AuctionHouseFilterMask(0); Array<uint8, BATTLE_PET_SPECIES_MAX_ID / 8 + 1> KnownPets; int8 MaxPetLevel = 0; Optional<Addon::AddOnInfo> TaintedBy; @@ -206,7 +207,7 @@ namespace WorldPackets ObjectGuid Auctioneer; uint32 Offset = 0; - int8 Unk = 0; + int8 Unknown830 = 0; Optional<Addon::AddOnInfo> TaintedBy; Array<AuctionSortDef, 2> Sorts; AuctionBucketKey BucketKey; @@ -235,7 +236,6 @@ namespace WorldPackets void Read() override; ObjectGuid Auctioneer; - uint32 Offset = 0; Optional<Addon::AddOnInfo> TaintedBy; Array<AuctionBucketKey, 100> BucketKeys; Array<AuctionSortDef, 2> Sorts; @@ -382,6 +382,7 @@ namespace WorldPackets ObjectGuid Guid; ///< the GUID of the bidder for this auction. uint64 MinIncrement = 0; ///< the sum of outbid is (1% of current bid) * 5, if the bid is too small, then this value is 1 copper. uint64 Money = 0; ///< the amount of money that the player bid in copper + uint32 DesiredDelay = 0; }; class AuctionCommodityPriceUpdate final : public ServerPacket |
