From 1b0b820965425d1e5a40668faf75b3e41e870e45 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 25 Jan 2019 03:15:56 +0300 Subject: Add packet CMSG_INVENTORY_EXPAND_CONFIRM 0x0b16 --- src/net/eathena/inventoryhandler.cpp | 11 +++++++++++ src/net/eathena/inventoryhandler.h | 2 ++ src/net/eathena/packetsout.inc | 4 ++++ src/net/inventoryhandler.h | 2 ++ src/net/tmwa/inventoryhandler.cpp | 4 ++++ src/net/tmwa/inventoryhandler.h | 2 ++ 6 files changed, 25 insertions(+) diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp index b9391bd31..f484afac9 100644 --- a/src/net/eathena/inventoryhandler.cpp +++ b/src/net/eathena/inventoryhandler.cpp @@ -614,4 +614,15 @@ void InventoryHandler::expandInventory() const createOutPacket(CMSG_INVENTORY_EXPAND); } +void InventoryHandler::expandInventoryConfirm() const +{ + if (packetVersionMain < 20181031 && + packetVersionRe < 20181031 && + packetVersionZero < 20181114) + { + return; + } + createOutPacket(CMSG_INVENTORY_EXPAND_CONFIRM); +} + } // namespace EAthena diff --git a/src/net/eathena/inventoryhandler.h b/src/net/eathena/inventoryhandler.h index 179402a39..3494cd6c1 100644 --- a/src/net/eathena/inventoryhandler.h +++ b/src/net/eathena/inventoryhandler.h @@ -84,6 +84,8 @@ class InventoryHandler final : public Ea::InventoryHandler void expandInventory() const override final; + void expandInventoryConfirm() const override final; + int getProjectileSlot() const override final { return 10; } diff --git a/src/net/eathena/packetsout.inc b/src/net/eathena/packetsout.inc index 7ba401f84..ef2358500 100644 --- a/src/net/eathena/packetsout.inc +++ b/src/net/eathena/packetsout.inc @@ -345,6 +345,7 @@ packet(CMSG_ACHIEVEMENT_GET_REWARD, 0x0000, 0, nullptr); packet(CMSG_LOGIN_MOBILE_OTP, 0x0000, 0, nullptr); packet(CMSG_LOGIN_OTP_CODE, 0x0000, 0, nullptr); packet(CMSG_INVENTORY_EXPAND, 0x0000, 0, nullptr); +packet(CMSG_INVENTORY_EXPAND_CONFIRM, 0x0000, 0, nullptr); #else // 20040713 if (packetVersion >= 20040713) @@ -1469,12 +1470,14 @@ if (packetVersionRe >= 20180718) if (packetVersionMain >= 20181031) { packet(CMSG_INVENTORY_EXPAND, 0x0b14, 2, clif->pInventoryExpansion); + packet(CMSG_INVENTORY_EXPAND_CONFIRM, 0x0b16, 2, clif->pInventoryExpansionConfirm); } // 20181031 re if (packetVersionRe >= 20181031) { packet(CMSG_INVENTORY_EXPAND, 0x0b14, 2, clif->pInventoryExpansion); + packet(CMSG_INVENTORY_EXPAND_CONFIRM, 0x0b16, 2, clif->pInventoryExpansionConfirm); } // 20181114 main @@ -1495,6 +1498,7 @@ if (packetVersionRe >= 20181114) if (packetVersionZero >= 20181114) { packet(CMSG_INVENTORY_EXPAND, 0x0b14, 2, clif->pInventoryExpansion); + packet(CMSG_INVENTORY_EXPAND_CONFIRM, 0x0b16, 2, clif->pInventoryExpansionConfirm); } #endif diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h index 18e4d3eed..3fa58f93f 100644 --- a/src/net/inventoryhandler.h +++ b/src/net/inventoryhandler.h @@ -107,6 +107,8 @@ class InventoryHandler notfinal virtual void mergetItemsCancel() const = 0; virtual void expandInventory() const = 0; + + virtual void expandInventoryConfirm() const = 0; }; } // namespace Net diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index ee60e399c..3f5e93d75 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -197,4 +197,8 @@ void InventoryHandler::expandInventory() const { } +void InventoryHandler::expandInventoryConfirm() const +{ +} + } // namespace TmwAthena diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h index a7e5a4b30..5dfa2d230 100644 --- a/src/net/tmwa/inventoryhandler.h +++ b/src/net/tmwa/inventoryhandler.h @@ -81,6 +81,8 @@ class InventoryHandler final : public Ea::InventoryHandler void expandInventory() const override final; + void expandInventoryConfirm() const override final; + int getProjectileSlot() const override final { return 10; } -- cgit v1.2.3-60-g2f50