From ae0ade61326aa52df63aeb7742133160b8c78047 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 11 Feb 2015 16:23:03 +0300 Subject: Add typed bool type Equipped. --- src/gui/windows/outfitwindow.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/gui/windows/outfitwindow.cpp') diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index d73f86a05..3a0f26d64 100644 --- a/src/gui/windows/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -281,7 +281,9 @@ void OutfitWindow::wearOutfit(const int outfit, const bool unwearEmpty, { const Item *const item = PlayerInfo::getInventory()->findItem( mItems[outfit][i], mItemColors[outfit][i]); - if (item && !item->isEquipped() && item->getQuantity()) + if (item + && item->isEquipped() == Equipped_false + && item->getQuantity()) { if (item->isEquipment() == Equipm_true) { @@ -516,7 +518,7 @@ void OutfitWindow::unequipNotInOutfit(const int outfit) const for (unsigned i = 0; i < invSize; i++) { const Item *const item = inventory->getItem(i); - if (item && item->isEquipped()) + if (item && item->isEquipped() == Equipped_true) { bool found = false; for (unsigned f = 0; f < OUTFIT_ITEM_COUNT; f++) @@ -632,7 +634,7 @@ void OutfitWindow::copyFromEquiped(const int dst) for (unsigned i = 0, sz = inventory->getSize(); i < sz; i++) { const Item *const item = inventory->getItem(i); - if (item && item->isEquipped()) + if (item && item->isEquipped() == Equipped_true) { mItems[dst][outfitCell] = item->getId(); mItemColors[dst][outfitCell++] = item->getColor(); -- cgit v1.2.3-60-g2f50