summaryrefslogtreecommitdiff
path: root/src/net/eathena/packetsin.inc
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-23 02:36:39 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-23 02:36:39 +0300
commit4a0aa65d1b215f8f51c6ff5a0a048f9898be6cd0 (patch)
tree2162d878419fc84f664dc06fdf8bdf5bead1bb10 /src/net/eathena/packetsin.inc
parent4d64a04f3dc37461344d83b972094b3d35e59ca8 (diff)
downloadmanaplus-4a0aa65d1b215f8f51c6ff5a0a048f9898be6cd0.tar.gz
manaplus-4a0aa65d1b215f8f51c6ff5a0a048f9898be6cd0.tar.bz2
manaplus-4a0aa65d1b215f8f51c6ff5a0a048f9898be6cd0.tar.xz
manaplus-4a0aa65d1b215f8f51c6ff5a0a048f9898be6cd0.zip
Add packet SMSG_ACK_MERGE_ITEMS 0x096f.
Diffstat (limited to 'src/net/eathena/packetsin.inc')
-rw-r--r--src/net/eathena/packetsin.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net/eathena/packetsin.inc b/src/net/eathena/packetsin.inc
index 1cba2a987..5c2e8b7a0 100644
--- a/src/net/eathena/packetsin.inc
+++ b/src/net/eathena/packetsin.inc
@@ -482,7 +482,7 @@ else
}
packet(SMSG_MERGE_ITEM, 0x096d, -1, &InventoryRecv::processMergeItem);
-packet(SMSG_ACK_MERGE_ITEMS, 0x096f, 7, nullptr);
+packet(SMSG_ACK_MERGE_ITEMS, 0x096f, 7, &InventoryRecv::processMergeItemResponse);
// unused or not implimented packets
packet(SMSG_BOOKING_REGISTER_ACK, 0x0803, 4, nullptr);