From 3523abdc818480c23d0cc22ab2c36d4bb0694c51 Mon Sep 17 00:00:00 2001 From: karashiiro <49822414+karashiiro@users.noreply.github.com> Date: Fri, 16 Aug 2019 17:34:02 -0700 Subject: [PATCH] suggestion commits --- src/common/Network/PacketDef/Ipcs.h | 2 +- src/common/Network/PacketDef/Zone/ServerZoneDef.h | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index 0b47938f..ab499c36 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -106,7 +106,7 @@ namespace Sapphire::Network::Packets ReqMoogleMailLetter = 0x0139, // updated 5.0 MailLetterNotification = 0x013A, // updated 5.0 - MarketBoardItemListingCount = 0x0125, // updated 4.5 + MarketBoardItemListingCount = 0x013B, // updated 5.0 MarketBoardItemListing = 0x013C, // updated 5.0 MarketBoardItemListingHistory = 0x012A, // updated 4.5 MarketBoardSearchResult = 0x0139, // updated 4.5 diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index 44b9510e..efb57bb7 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -294,7 +294,7 @@ namespace Sapphire::Network::Packets::Server struct FFXIVIpcMarketBoardItemListing : FFXIVIpcBasePacket< MarketBoardItemListing > { - struct itemListing // 152 bytes each + struct ItemListing // 152 bytes each { uint32_t unknown; // Changes if multiple packets are sent for a single item uint8_t padding; @@ -309,13 +309,18 @@ namespace Sapphire::Network::Packets::Server uint32_t pricePerUnit; uint32_t unknown7; uint32_t itemQuantity; - uint32_t itemID; + uint32_t itemId; uint16_t unknown8; uint16_t unknown9; uint32_t unknown10; uint16_t unknown11; // Always 30000 uint16_t padding3; - uint16_t materiaValue[5]; // Materia ID = (materiaValue & 0xFF0) >> 4 + uint16_t materiaValue[5]; + /** + * auto materiaId = (i & 0xFF0) >> 4; + * auto index = i & 0xF; + * auto leftover = i >> 8; + */ uint32_t padding4; char retainerName[64]; bool hq;