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/ea | |
| 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/ea')
| -rw-r--r-- | src/net/ea/inventoryhandler.cpp | 10 | ||||
| -rw-r--r-- | src/net/ea/inventoryhandler.h | 3 | ||||
| -rw-r--r-- | src/net/ea/inventoryrecv.cpp | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 8d3ad6c9f..b1aa87020 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -81,18 +81,18 @@ void InventoryHandler::openStorage(const int type A_UNUSED) const // Doesn't apply to eAthena, since opening happens through NPCs? } -size_t InventoryHandler::getSize(const int type) const +size_t InventoryHandler::getSize(const InventoryTypeT type) const { switch (type) { - case InventoryType::INVENTORY: + case InventoryType::Inventory: return 100; - case InventoryType::STORAGE: + case InventoryType::Storage: return 0; // Comes from server after items - case InventoryType::TRADE: + case InventoryType::Trade: return 12; // GUILD_STORAGE - case InventoryType::TYPE_END: + case InventoryType::TypeEnd: return 0; // Comes from server after items default: return 0; diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index 313485dd4..5c6f4258e 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -56,7 +56,8 @@ class InventoryHandler notfinal : public Net::InventoryHandler void openStorage(const int type) const override final; - size_t getSize(const int type) const override final A_WARN_UNUSED; + size_t getSize(const InventoryTypeT type) const override final + A_WARN_UNUSED; void pushPickup(const BeingId floorId); diff --git a/src/net/ea/inventoryrecv.cpp b/src/net/ea/inventoryrecv.cpp index 7a96e86cd..bda53bab3 100644 --- a/src/net/ea/inventoryrecv.cpp +++ b/src/net/ea/inventoryrecv.cpp @@ -148,7 +148,7 @@ void InventoryRecv::processPlayerStorageStatus(Net::MessageIn &msg) const int size = msg.readInt16("max size"); if (!mStorage) - mStorage = new Inventory(InventoryType::STORAGE, size); + mStorage = new Inventory(InventoryType::Storage, size); FOR_EACH (Ea::InventoryItems::const_iterator, it, mInventoryItems) { |