summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/inventoryhandler.cpp5
-rw-r--r--src/net/eathena/inventoryhandler.h2
-rw-r--r--src/net/eathena/packetsout.inc1
3 files changed, 8 insertions, 0 deletions
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<Item*> &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<Item*> &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);