summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-11-16 22:17:15 +0300
committerAndrei Karas <akaras@inbox.ru>2015-11-16 22:17:15 +0300
commit5e8e53f6e795a84ab5ca6cfe0d08672878044707 (patch)
tree23f5a196c6a288ef52cea2742b02ddbc52b2db61 /src/net/tmwa
parent0c063cf5b45a843485fe3343e5fb79a40141f88c (diff)
downloadplus-5e8e53f6e795a84ab5ca6cfe0d08672878044707.tar.gz
plus-5e8e53f6e795a84ab5ca6cfe0d08672878044707.tar.bz2
plus-5e8e53f6e795a84ab5ca6cfe0d08672878044707.tar.xz
plus-5e8e53f6e795a84ab5ca6cfe0d08672878044707.zip
Convert InventoryType enum into strong typed.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/inventoryhandler.cpp16
-rw-r--r--src/net/tmwa/inventoryhandler.h6
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;