diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-04-06 00:17:35 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-04-06 00:17:35 +0300 |
| commit | 06ff9c9d685dafdb11ec4ea121016eb8c40fdd6a (patch) | |
| tree | ebff8c227b592a8d2118ad5f4dee16d45e348e89 /src/net/eathena | |
| parent | 8d19c3ed8e0c03f162e022dd0f09fff53f2bc055 (diff) | |
| download | manaplus-06ff9c9d685dafdb11ec4ea121016eb8c40fdd6a.tar.gz manaplus-06ff9c9d685dafdb11ec4ea121016eb8c40fdd6a.tar.bz2 manaplus-06ff9c9d685dafdb11ec4ea121016eb8c40fdd6a.tar.xz manaplus-06ff9c9d685dafdb11ec4ea121016eb8c40fdd6a.zip | |
Impliment packet CMSG_MERGE_ITEM_CANCEL 0x0974.
Diffstat (limited to 'src/net/eathena')
| -rw-r--r-- | src/net/eathena/inventoryhandler.cpp | 5 | ||||
| -rw-r--r-- | src/net/eathena/inventoryhandler.h | 2 | ||||
| -rw-r--r-- | src/net/eathena/packetsout.inc | 1 |
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); |