summaryrefslogtreecommitdiff
path: root/src/net/eathena/inventoryrecv.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-23 02:31:54 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-23 02:31:54 +0300
commit4d64a04f3dc37461344d83b972094b3d35e59ca8 (patch)
tree7562dea8831d9c749ff2a431943fcd0468dff0d2 /src/net/eathena/inventoryrecv.h
parentffd2832c4a84c534afa0302d03ae857f9a1c28e9 (diff)
downloadmv-4d64a04f3dc37461344d83b972094b3d35e59ca8.tar.gz
mv-4d64a04f3dc37461344d83b972094b3d35e59ca8.tar.bz2
mv-4d64a04f3dc37461344d83b972094b3d35e59ca8.tar.xz
mv-4d64a04f3dc37461344d83b972094b3d35e59ca8.zip
Add packet SMSG_MERGE_ITEM 0x096d.
Diffstat (limited to 'src/net/eathena/inventoryrecv.h')
-rw-r--r--src/net/eathena/inventoryrecv.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/net/eathena/inventoryrecv.h b/src/net/eathena/inventoryrecv.h
index d024c8362..6f45bc1b7 100644
--- a/src/net/eathena/inventoryrecv.h
+++ b/src/net/eathena/inventoryrecv.h
@@ -71,6 +71,7 @@ namespace EAthena
void processBindItem(Net::MessageIn &msg);
void processPlayerInventoryRemove(Net::MessageIn &msg);
void processSelectCart(Net::MessageIn &msg);
+ void processMergeItem(Net::MessageIn &msg);
int getSlot(const int eAthenaSlot) A_WARN_UNUSED;
} // namespace InventoryRecv