summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-06 00:17:35 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-06 00:17:35 +0300
commit06ff9c9d685dafdb11ec4ea121016eb8c40fdd6a (patch)
treeebff8c227b592a8d2118ad5f4dee16d45e348e89 /src/net/tmwa
parent8d19c3ed8e0c03f162e022dd0f09fff53f2bc055 (diff)
downloadmv-06ff9c9d685dafdb11ec4ea121016eb8c40fdd6a.tar.gz
mv-06ff9c9d685dafdb11ec4ea121016eb8c40fdd6a.tar.bz2
mv-06ff9c9d685dafdb11ec4ea121016eb8c40fdd6a.tar.xz
mv-06ff9c9d685dafdb11ec4ea121016eb8c40fdd6a.zip
Impliment packet CMSG_MERGE_ITEM_CANCEL 0x0974.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/inventoryhandler.cpp4
-rw-r--r--src/net/tmwa/inventoryhandler.h2
2 files changed, 6 insertions, 0 deletions
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<Item*> &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<Item*> &items) const override final;
+ void mergetItemsCancel() const override final;
+
int getProjectileSlot() const override final
{ return 10; }