From 06ff9c9d685dafdb11ec4ea121016eb8c40fdd6a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 6 Apr 2016 00:17:35 +0300 Subject: Impliment packet CMSG_MERGE_ITEM_CANCEL 0x0974. --- src/net/eathena/inventoryhandler.cpp | 5 +++++ src/net/eathena/inventoryhandler.h | 2 ++ src/net/eathena/packetsout.inc | 1 + src/net/inventoryhandler.h | 2 ++ src/net/tmwa/inventoryhandler.cpp | 4 ++++ src/net/tmwa/inventoryhandler.h | 2 ++ 6 files changed, 16 insertions(+) (limited to 'src/net') diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp index 4ad6e409e..201cf038f 100644 --- a/src/net/eathena/inventoryhandler.cpp +++ b/src/net/eathena/inventoryhandler.cpp @@ -244,4 +244,9 @@ void InventoryHandler::mergeItemsAck(const std::vector &items) const } } +void InventoryHandler::mergetItemsCancel() const +{ + createOutPacket(CMSG_MERGE_ITEM_CANCEL); +} + } // namespace EAthena diff --git a/src/net/eathena/inventoryhandler.h b/src/net/eathena/inventoryhandler.h index 53e801934..8f144f57e 100644 --- a/src/net/eathena/inventoryhandler.h +++ b/src/net/eathena/inventoryhandler.h @@ -73,6 +73,8 @@ class InventoryHandler final : public Ea::InventoryHandler void mergeItemsAck(const std::vector &items) const override final; + void mergetItemsCancel() const override final; + int getProjectileSlot() const override final { return 23; } diff --git a/src/net/eathena/packetsout.inc b/src/net/eathena/packetsout.inc index 44ea8785f..ee5d35ba5 100644 --- a/src/net/eathena/packetsout.inc +++ b/src/net/eathena/packetsout.inc @@ -265,6 +265,7 @@ packet(CMSG_SEARCHSTORE_CLOSE, 0x083b); packet(CMSG_SEARCHSTORE_CLICK, 0x0835); packet(CMSG_MERGE_ITEM_ACK, 0x096e); +packet(CMSG_MERGE_ITEM_CANCEL, 0x0974); packet(CMSG_SET_STATUS, 0x0b0e); diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h index 851f0ba84..80e113e47 100644 --- a/src/net/inventoryhandler.h +++ b/src/net/inventoryhandler.h @@ -95,6 +95,8 @@ class InventoryHandler notfinal virtual void identifyItem(const Item *const item) const = 0; virtual void mergeItemsAck(const std::vector &items) const = 0; + + virtual void mergetItemsCancel() const = 0; }; } // namespace Net diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index 6fa3b9b5c..3752c01e4 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -178,4 +178,8 @@ void InventoryHandler::mergeItemsAck(const std::vector &items A_UNUSED) { } +void InventoryHandler::mergetItemsCancel() const +{ +} + } // namespace TmwAthena diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h index 435e87805..dfd2776da 100644 --- a/src/net/tmwa/inventoryhandler.h +++ b/src/net/tmwa/inventoryhandler.h @@ -73,6 +73,8 @@ class InventoryHandler final : public Ea::InventoryHandler void mergeItemsAck(const std::vector &items) const override final; + void mergetItemsCancel() const override final; + int getProjectileSlot() const override final { return 10; } -- cgit v1.2.3-70-g09d2