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/being | |
| parent | 4a337b7a42d0c92bc2ed26b7e206188dc04c569d (diff) | |
| download | manaplus-ae0ade61326aa52df63aeb7742133160b8c78047.tar.gz manaplus-ae0ade61326aa52df63aeb7742133160b8c78047.tar.bz2 manaplus-ae0ade61326aa52df63aeb7742133160b8c78047.tar.xz manaplus-ae0ade61326aa52df63aeb7742133160b8c78047.zip | |
Add typed bool type Equipped.
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/localplayer.cpp | 8 | ||||
| -rw-r--r-- | src/being/playerinfo.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
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); |