diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-03-23 02:31:54 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-03-23 02:31:54 +0300 |
commit | 4d64a04f3dc37461344d83b972094b3d35e59ca8 (patch) | |
tree | 7562dea8831d9c749ff2a431943fcd0468dff0d2 /src/net/eathena/packetsin.inc | |
parent | ffd2832c4a84c534afa0302d03ae857f9a1c28e9 (diff) | |
download | manaplus-4d64a04f3dc37461344d83b972094b3d35e59ca8.tar.gz manaplus-4d64a04f3dc37461344d83b972094b3d35e59ca8.tar.bz2 manaplus-4d64a04f3dc37461344d83b972094b3d35e59ca8.tar.xz manaplus-4d64a04f3dc37461344d83b972094b3d35e59ca8.zip |
Add packet SMSG_MERGE_ITEM 0x096d.
Diffstat (limited to 'src/net/eathena/packetsin.inc')
-rw-r--r-- | src/net/eathena/packetsin.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net/eathena/packetsin.inc b/src/net/eathena/packetsin.inc index e0a365019..1cba2a987 100644 --- a/src/net/eathena/packetsin.inc +++ b/src/net/eathena/packetsin.inc @@ -481,7 +481,7 @@ else packet(SMSG_SELECT_CART, 0x0000, 0, nullptr); } -packet(SMSG_MERGE_ITEM, 0x096d, -1, nullptr); +packet(SMSG_MERGE_ITEM, 0x096d, -1, &InventoryRecv::processMergeItem); packet(SMSG_ACK_MERGE_ITEMS, 0x096f, 7, nullptr); // unused or not implimented packets |