summaryrefslogtreecommitdiff
path: root/src/net/ea
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-11 16:23:03 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-11 16:23:03 +0300
commitae0ade61326aa52df63aeb7742133160b8c78047 (patch)
treeb04c09807058b593949fe634098e73474a58589d /src/net/ea
parent4a337b7a42d0c92bc2ed26b7e206188dc04c569d (diff)
downloadmanaplus-ae0ade61326aa52df63aeb7742133160b8c78047.tar.gz
manaplus-ae0ade61326aa52df63aeb7742133160b8c78047.tar.bz2
manaplus-ae0ade61326aa52df63aeb7742133160b8c78047.tar.xz
manaplus-ae0ade61326aa52df63aeb7742133160b8c78047.zip
Add typed bool type Equipped.
Diffstat (limited to 'src/net/ea')
-rw-r--r--src/net/ea/buysellhandler.cpp2
-rw-r--r--src/net/ea/equipbackend.h6
-rw-r--r--src/net/ea/inventoryhandler.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index 11785fec0..537a741ea 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -162,7 +162,7 @@ void BuySellHandler::processNpcSell(Net::MessageIn &msg)
const Item *const item = PlayerInfo::getInventory()
->getItem(index);
- if (item && !(item->isEquipped()))
+ if (item && item->isEquipped() == Equipped_false)
dialog->addItem(item, value);
}
}
diff --git a/src/net/ea/equipbackend.h b/src/net/ea/equipbackend.h
index 6f09e8e9c..3b3297315 100644
--- a/src/net/ea/equipbackend.h
+++ b/src/net/ea/equipbackend.h
@@ -67,7 +67,7 @@ class EquipBackend final : public Equipment::Backend
{
Item* item = inv->getItem(i);
if (item)
- item->setEquipped(false);
+ item->setEquipped(Equipped_false);
}
mEquipment[i] = -1;
@@ -87,14 +87,14 @@ class EquipBackend final : public Equipment::Backend
Item *item = inv->getItem(mEquipment[index]);
if (item)
- item->setEquipped(false);
+ item->setEquipped(Equipped_false);
// not checking index because it must be safe
mEquipment[index] = inventoryIndex;
item = inv->getItem(inventoryIndex);
if (item)
- item->setEquipped(true);
+ item->setEquipped(Equipped_true);
if (inventoryWindow)
inventoryWindow->updateButtons();
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index e81b0a490..026359d76 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -262,7 +262,7 @@ void InventoryHandler::processPlayerStorageStatus(Net::MessageIn &msg)
(*it).damaged,
(*it).favorite,
(*it).equip,
- false);
+ Equipped_false);
}
mInventoryItems.clear();