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/eathena | |
parent | 0c063cf5b45a843485fe3343e5fb79a40141f88c (diff) | |
download | mv-5e8e53f6e795a84ab5ca6cfe0d08672878044707.tar.gz mv-5e8e53f6e795a84ab5ca6cfe0d08672878044707.tar.bz2 mv-5e8e53f6e795a84ab5ca6cfe0d08672878044707.tar.xz mv-5e8e53f6e795a84ab5ca6cfe0d08672878044707.zip |
Convert InventoryType enum into strong typed.
Diffstat (limited to 'src/net/eathena')
-rw-r--r-- | src/net/eathena/inventoryhandler.cpp | 24 | ||||
-rw-r--r-- | src/net/eathena/inventoryhandler.h | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp index 1b781c3be..05d8c77ca 100644 --- a/src/net/eathena/inventoryhandler.cpp +++ b/src/net/eathena/inventoryhandler.cpp @@ -119,38 +119,38 @@ 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, +void InventoryHandler::moveItem2(const InventoryTypeT source, const int slot, const int amount, - const int destination) const + const InventoryTypeT destination) const { int packet = 0; int offset = INVENTORY_OFFSET; - if (source == InventoryType::INVENTORY) + if (source == InventoryType::Inventory) { - if (destination == InventoryType::STORAGE) + if (destination == InventoryType::Storage) packet = CMSG_MOVE_TO_STORAGE; - else if (destination == InventoryType::CART) + else if (destination == InventoryType::Cart) packet = CMSG_MOVE_TO_CART; } - else if (source == InventoryType::STORAGE) + else if (source == InventoryType::Storage) { offset = STORAGE_OFFSET; - if (destination == InventoryType::INVENTORY) + if (destination == InventoryType::Inventory) packet = CMSG_MOVE_FROM_STORAGE; - else if (destination == InventoryType::CART) + else if (destination == InventoryType::Cart) packet = CMSG_MOVE_FROM_STORAGE_TO_CART; } - else if (source == InventoryType::CART) + else if (source == InventoryType::Cart) { - if (destination == InventoryType::INVENTORY) + if (destination == InventoryType::Inventory) packet = CMSG_MOVE_FROM_CART; - else if (destination == InventoryType::STORAGE) + else if (destination == InventoryType::Storage) packet = CMSG_MOVE_FROM_CART_TO_STORAGE; } diff --git a/src/net/eathena/inventoryhandler.h b/src/net/eathena/inventoryhandler.h index 924275757..a398fe2eb 100644 --- a/src/net/eathena/inventoryhandler.h +++ b/src/net/eathena/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; |