diff options
Diffstat (limited to 'src/net/tmwa')
| -rw-r--r-- | src/net/tmwa/inventoryhandler.cpp | 16 | ||||
| -rw-r--r-- | src/net/tmwa/inventoryhandler.h | 6 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index 3248ec8f6..f4af144ea 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -110,24 +110,26 @@ void InventoryHandler::dropItem(const Item *const item, const int amount) const outMsg.writeInt16(static_cast<int16_t>(amount), "amount"); } -void InventoryHandler::closeStorage(const int type A_UNUSED) const +void InventoryHandler::closeStorage() const { createOutPacket(CMSG_CLOSE_STORAGE); } -void InventoryHandler::moveItem2(const int source, const int slot, - const int amount, const int destination) const +void InventoryHandler::moveItem2(const InventoryTypeT source, + const int slot, + const int amount, + const InventoryTypeT destination) const { - if (source == InventoryType::INVENTORY - && destination == InventoryType::STORAGE) + if (source == InventoryType::Inventory && + destination == InventoryType::Storage) { createOutPacket(CMSG_MOVE_TO_STORAGE); outMsg.writeInt16(static_cast<int16_t>(slot + INVENTORY_OFFSET), "index"); outMsg.writeInt32(amount, "amount"); } - else if (source == InventoryType::STORAGE - && destination == InventoryType::INVENTORY) + else if (source == InventoryType::Storage && + destination == InventoryType::Inventory) { createOutPacket(CMSG_MOVE_FROM_STORAGE); outMsg.writeInt16(static_cast<int16_t>(slot + STORAGE_OFFSET), diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h index d0ccedab5..81e300bd3 100644 --- a/src/net/tmwa/inventoryhandler.h +++ b/src/net/tmwa/inventoryhandler.h @@ -46,12 +46,12 @@ class InventoryHandler final : public Ea::InventoryHandler void dropItem(const Item *const item, const int amount) const override final; - void closeStorage(const int type) const override final; + void closeStorage() const override final; - void moveItem2(const int source, + void moveItem2(const InventoryTypeT source, const int slot, const int amount, - const int destination) const override final; + const InventoryTypeT destination) const override final; void useCard(const Item *const item) override final; |