From 4a0aa65d1b215f8f51c6ff5a0a048f9898be6cd0 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 23 Mar 2016 02:36:39 +0300
Subject: Add packet SMSG_ACK_MERGE_ITEMS 0x096f.
---
src/net/eathena/inventoryrecv.cpp | 9 +++++++++
src/net/eathena/inventoryrecv.h | 1 +
src/net/eathena/packetsin.inc | 2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
(limited to 'src/net')
diff --git a/src/net/eathena/inventoryrecv.cpp b/src/net/eathena/inventoryrecv.cpp
index b67300fa2..4d5565d1b 100644
--- a/src/net/eathena/inventoryrecv.cpp
+++ b/src/net/eathena/inventoryrecv.cpp
@@ -1189,4 +1189,13 @@ void InventoryRecv::processMergeItem(Net::MessageIn &msg)
msg.readInt16("inv index");
}
+void InventoryRecv::processMergeItemResponse(Net::MessageIn &msg)
+{
+ UNIMPLIMENTEDPACKET;
+
+ msg.readInt16("inv index");
+ msg.readInt16("amount");
+ msg.readUInt8("result");
+}
+
} // namespace EAthena
diff --git a/src/net/eathena/inventoryrecv.h b/src/net/eathena/inventoryrecv.h
index 6f45bc1b7..b509d1dec 100644
--- a/src/net/eathena/inventoryrecv.h
+++ b/src/net/eathena/inventoryrecv.h
@@ -72,6 +72,7 @@ namespace EAthena
void processPlayerInventoryRemove(Net::MessageIn &msg);
void processSelectCart(Net::MessageIn &msg);
void processMergeItem(Net::MessageIn &msg);
+ void processMergeItemResponse(Net::MessageIn &msg);
int getSlot(const int eAthenaSlot) A_WARN_UNUSED;
} // namespace InventoryRecv
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);
--
cgit v1.2.3-70-g09d2