diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-11-16 22:17:15 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-11-16 22:17:15 +0300 |
| commit | 5e8e53f6e795a84ab5ca6cfe0d08672878044707 (patch) | |
| tree | 23f5a196c6a288ef52cea2742b02ddbc52b2db61 /src/net/tmwa/inventoryhandler.cpp | |
| parent | 0c063cf5b45a843485fe3343e5fb79a40141f88c (diff) | |
| download | manaplus-5e8e53f6e795a84ab5ca6cfe0d08672878044707.tar.gz manaplus-5e8e53f6e795a84ab5ca6cfe0d08672878044707.tar.bz2 manaplus-5e8e53f6e795a84ab5ca6cfe0d08672878044707.tar.xz manaplus-5e8e53f6e795a84ab5ca6cfe0d08672878044707.zip | |
Convert InventoryType enum into strong typed.
Diffstat (limited to 'src/net/tmwa/inventoryhandler.cpp')
| -rw-r--r-- | src/net/tmwa/inventoryhandler.cpp | 16 |
1 files changed, 9 insertions, 7 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), |