diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-19 00:24:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-19 00:24:52 +0300 |
| commit | 495b746d928f28ce3e13ff95f26e8cddff2fb06e (patch) | |
| tree | 562c745fe55d7245c325072c7c0b6f6f0e922954 /src/being | |
| parent | 59f0029e490f076a4b45765a27c27bb7d57a193d (diff) | |
| download | manaverse-495b746d928f28ce3e13ff95f26e8cddff2fb06e.tar.gz manaverse-495b746d928f28ce3e13ff95f26e8cddff2fb06e.tar.bz2 manaverse-495b746d928f28ce3e13ff95f26e8cddff2fb06e.tar.xz manaverse-495b746d928f28ce3e13ff95f26e8cddff2fb06e.zip | |
Move itemslot into separate file.
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/localplayer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index 62eecb9b2..ea35660d8 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -67,6 +67,7 @@ #include "net/playerhandler.h" #include "resources/iteminfo.h" +#include "resources/itemslot.h" #include "resources/db/emotedb.h" #include "resources/db/weaponsdb.h" @@ -903,7 +904,7 @@ int LocalPlayer::getAttackRange() const } else { - const Item *const weapon = PlayerInfo::getEquipment(EQUIP_FIGHT1_SLOT); + const Item *const weapon = PlayerInfo::getEquipment(ItemSlot::FIGHT1_SLOT); if (weapon) { const ItemInfo &info = weapon->getInfo(); @@ -3459,7 +3460,7 @@ void LocalPlayer::imitateOutfit(const Being *const player, const int equipmentSlot = Net::getInventoryHandler() ->convertFromServerSlot(sprite); // logger->log("equipmentSlot: " + toString(equipmentSlot)); - if (equipmentSlot == EQUIP_PROJECTILE_SLOT) + if (equipmentSlot == ItemSlot::PROJECTILE_SLOT) return; const Item *const item = PlayerInfo::getEquipment(equipmentSlot); |