diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-02-11 16:23:03 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-02-11 16:23:03 +0300 |
| commit | ae0ade61326aa52df63aeb7742133160b8c78047 (patch) | |
| tree | b04c09807058b593949fe634098e73474a58589d /src/gui/widgets | |
| parent | 4a337b7a42d0c92bc2ed26b7e206188dc04c569d (diff) | |
| download | plus-ae0ade61326aa52df63aeb7742133160b8c78047.tar.gz plus-ae0ade61326aa52df63aeb7742133160b8c78047.tar.bz2 plus-ae0ade61326aa52df63aeb7742133160b8c78047.tar.xz plus-ae0ade61326aa52df63aeb7742133160b8c78047.zip | |
Add typed bool type Equipped.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/itemcontainer.cpp | 6 | ||||
| -rw-r--r-- | src/gui/widgets/itemshortcutcontainer.cpp | 6 | ||||
| -rw-r--r-- | src/gui/widgets/virtshortcutcontainer.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index dfb5a94cf..0bb8c50f3 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -317,13 +317,13 @@ void ItemContainer::draw(Graphics *graphics) { caption = toString(item->getQuantity()); } - else if (item->isEquipped()) + else if (item->isEquipped() == Equipped_true) { // TRANSLATORS: Text under equipped items (should be small) caption = _("Eq."); } - if (item->isEquipped()) + if (item->isEquipped() == Equipped_true) graphics->setColorAll(mEquipedColor, mEquipedColor2); else graphics->setColorAll(mUnEquipedColor, mUnEquipedColor2); @@ -600,7 +600,7 @@ void ItemContainer::mouseReleased(MouseEvent &event) item->getDamaged(), item->getFavorite(), Equipm_false, - false); + Equipped_false); } return; } diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 24dbee2aa..c11a83f8c 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -142,12 +142,12 @@ void ItemShortcutContainer::draw(Graphics *graphics) std::string caption; if (item->getQuantity() > 1) caption = toString(item->getQuantity()); - else if (item->isEquipped()) - caption = "Eq."; + else if (item->isEquipped() == Equipped_true) + caption = "Eq."; image->setAlpha(1.0F); graphics->drawImage(image, itemX, itemY); - if (item->isEquipped()) + if (item->isEquipped() == Equipped_true) { graphics->setColorAll(mEquipedColor, mEquipedColor2); } diff --git a/src/gui/widgets/virtshortcutcontainer.cpp b/src/gui/widgets/virtshortcutcontainer.cpp index 75e3391c7..b735f962e 100644 --- a/src/gui/widgets/virtshortcutcontainer.cpp +++ b/src/gui/widgets/virtshortcutcontainer.cpp @@ -117,12 +117,12 @@ void VirtShortcutContainer::draw(Graphics *graphics) std::string caption; if (item->getQuantity() > 1) caption = toString(item->getQuantity()); - else if (item->isEquipped()) + else if (item->isEquipped() == Equipped_true) caption = "Eq."; image->setAlpha(1.0F); graphics->drawImage(image, itemX, itemY); - if (item->isEquipped()) + if (item->isEquipped() == Equipped_true) graphics->setColorAll(mEquipedColor, mEquipedColor2); else graphics->setColorAll(mUnEquipedColor, mUnEquipedColor2); |