From ae0ade61326aa52df63aeb7742133160b8c78047 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 11 Feb 2015 16:23:03 +0300
Subject: Add typed bool type Equipped.

---
 src/being/localplayer.cpp | 8 ++++----
 src/being/playerinfo.cpp  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/being')

diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 17ee2d823..02c63bf97 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -1291,7 +1291,7 @@ void LocalPlayer::changeEquipmentBeforeAttack(const Being *const target) const
             return;
 
         // if sword not equiped
-        if (!item->isEquipped())
+        if (item->isEquipped() == Equipped_false)
             PlayerInfo::equipItem(item, true);
 
         // if need equip shield too
@@ -1305,7 +1305,7 @@ void LocalPlayer::changeEquipmentBeforeAttack(const Being *const target) const
                 if (item)
                     break;
             }
-            if (item && !item->isEquipped())
+            if (item && item->isEquipped() == Equipped_false)
                 PlayerInfo::equipItem(item, true);
         }
     }
@@ -1325,7 +1325,7 @@ void LocalPlayer::changeEquipmentBeforeAttack(const Being *const target) const
         if (!item)
             return;
 
-        if (!item->isEquipped())
+        if (item->isEquipped() == Equipped_false)
             PlayerInfo::equipItem(item, true);
     }
 }
@@ -2950,7 +2950,7 @@ void LocalPlayer::imitateOutfit(const Being *const player,
 //            logger->log("idPath: " + path);
             const Item *const item = inv->findItemBySprite(path,
                 player->getGender(), player->getSubType());
-            if (item && !item->isEquipped())
+            if (item && item->isEquipped() == Equipped_false)
                 PlayerInfo::equipItem(item, false);
         }
         else
diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp
index 5b2b60433..892c5bba9 100644
--- a/src/being/playerinfo.cpp
+++ b/src/being/playerinfo.cpp
@@ -265,7 +265,7 @@ void useEquipItem(const Item *const item, const bool sfx)
     {
         if (item->isEquipment() == Equipm_true)
         {
-            if (item->isEquipped())
+            if (item->isEquipped() == Equipped_true)
             {
                 if (sfx)
                     ItemSoundManager::playSfx(item, ItemSoundEvent::UNEQUIP);
@@ -296,7 +296,7 @@ void useEquipItem2(const Item *const item, const bool sfx)
     {
         if (item->isEquipment() == Equipm_false)
         {
-            if (item->isEquipped())
+            if (item->isEquipped() == Equipped_true)
             {
                 if (sfx)
                     ItemSoundManager::playSfx(item, ItemSoundEvent::UNEQUIP);
-- 
cgit v1.2.3-70-g09d2