summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-09 17:01:33 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-09 17:01:33 +0300
commite88234e3d4d52ab4930d907562f68775fa558d07 (patch)
tree9df19628dce0395fa8e38de0e587a7bb31231749
parent84b673bf3871970e43f8358728b5c4aedfc3f1e4 (diff)
downloadmanaplus-e88234e3d4d52ab4930d907562f68775fa558d07.tar.gz
manaplus-e88234e3d4d52ab4930d907562f68775fa558d07.tar.bz2
manaplus-e88234e3d4d52ab4930d907562f68775fa558d07.tar.xz
manaplus-e88234e3d4d52ab4930d907562f68775fa558d07.zip
eathena: add packet CMSG_MOVE_FROM_CART 0x0127.
-rw-r--r--src/net/eathena/inventoryhandler.cpp6
-rw-r--r--src/net/eathena/protocol.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 7fa96f64e..74fcb920b 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -223,6 +223,12 @@ void InventoryHandler::moveItem2(const int source, const int slot,
outMsg.writeInt16(static_cast<int16_t>(slot + INVENTORY_OFFSET));
outMsg.writeInt32(amount);
}
+ else if (source == Inventory::CART && destination == Inventory::INVENTORY)
+ {
+ MessageOut outMsg(CMSG_MOVE_FROM_CART);
+ outMsg.writeInt16(static_cast<int16_t>(slot + INVENTORY_OFFSET));
+ outMsg.writeInt32(amount);
+ }
}
void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg)
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index a27ca6f06..8917cb15d 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -281,6 +281,7 @@
#define CMSG_CLOSE_STORAGE 0x0193 /** Request storage close */
#define CMSG_MOVE_TO_CART 0x0126
+#define CMSG_MOVE_FROM_CART 0x0127
#define CMSG_ADMIN_ANNOUNCE 0x0099
#define CMSG_ADMIN_LOCAL_ANNOUNCE 0x019C