Add typed bool type Equipped.

5 files changed, 19 insertions, 19 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();
 
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 835b341a8..9f22b34ff 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -387,7 +387,7 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg)
                 fromBool(flags.bits.isDamaged, Damaged),
                 fromBool(flags.bits.isFavorite, Favorite),
                 Equipm_true,
-                false);
+                Equipped_false);
             inventory->setCards(index, cards, 4);
         }
 
@@ -488,7 +488,7 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
                 fromBool(damaged, Damaged),
                 Favorite_false,
                 fromBool(equipType, Equipm),
-                false);
+                Equipped_false);
             inventory->setCards(index, cards, 4);
         }
         ArrowsListener::distributeEvent();
@@ -537,7 +537,7 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg)
                 fromBool(flags.bits.isDamaged, Damaged),
                 fromBool(flags.bits.isFavorite, Favorite),
                 Equipm_false,
-                false);
+                Equipped_false);
             inventory->setCards(index, cards, 4);
         }
     }
@@ -709,7 +709,7 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg)
                 Damaged_false,
                 Favorite_false,
                 Equipm_false,
-                false);
+                Equipped_false);
             mStorage->setCards(index, cards, 4);
         }
     }
@@ -813,7 +813,7 @@ void InventoryHandler::processCartInfo(Net::MessageIn &msg)
             (*it).damaged,
             (*it).favorite,
             (*it).equip,
-            false);
+            Equipped_false);
     }
     mCartItems.clear();
 }
@@ -853,7 +853,7 @@ void InventoryHandler::processPlayerCartAdd(Net::MessageIn &msg)
             Damaged_false,
             Favorite_false,
             Equipm_false,
-            false);
+            Equipped_false);
         inventory->setCards(index, cards, 4);
     }
     BLOCK_END("InventoryHandler::processPlayerCartAdd")
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 0d0611122..ea8a912b7 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -302,7 +302,7 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg)
                     Damaged_false,
                     Favorite_false,
                     Equipm_true,
-                    false);
+                    Equipped_false);
             }
             else
             {
@@ -312,7 +312,7 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg)
                     Damaged_false,
                     Favorite_false,
                     Equipm_true,
-                    false);
+                    Equipped_false);
             }
             inventory->setCards(index, cards, 4);
         }
@@ -414,7 +414,7 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
                     Damaged_false,
                     Favorite_false,
                     fromBool(equipType, Equipm),
-                    false);
+                    Equipped_false);
             }
             else
             {
@@ -424,7 +424,7 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
                     Damaged_false,
                     Favorite_false,
                     fromBool(equipType, Equipm),
-                    false);
+                    Equipped_false);
             }
             inventory->setCards(index, cards, 4);
         }
@@ -485,7 +485,7 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg)
                     Damaged_false,
                     Favorite_false,
                     fromBool(isEquipment, Equipm),
-                    false);
+                    Equipped_false);
             }
             else
             {
@@ -495,7 +495,7 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg)
                     Damaged_false,
                     Favorite_false,
                     fromBool(isEquipment, Equipm),
-                    false);
+                    Equipped_false);
             }
             inventory->setCards(index, cards, 4);
         }
@@ -665,7 +665,7 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg)
                     Damaged_false,
                     Favorite_false,
                     Equipm_false,
-                    false);
+                    Equipped_false);
             }
             else
             {
@@ -675,7 +675,7 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg)
                     Damaged_false,
                     Favorite_false,
                     Equipm_false,
-                    false);
+                    Equipped_false);
             }
             mStorage->setCards(index, cards, 4);
         }