diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-03-06 03:22:03 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-03-06 03:22:03 +0300 |
commit | fe4bd9d594ae6c305c9c51a32fca503dbb2e0771 (patch) | |
tree | e0793ac44f6fc596f3a8a7ca1342d65c2e24953b /src/net/ea | |
parent | 2b019f52da91cb37c00dfa34be6dd3e99e459d47 (diff) | |
download | manaplus-fe4bd9d594ae6c305c9c51a32fca503dbb2e0771.tar.gz manaplus-fe4bd9d594ae6c305c9c51a32fca503dbb2e0771.tar.bz2 manaplus-fe4bd9d594ae6c305c9c51a32fca503dbb2e0771.tar.xz manaplus-fe4bd9d594ae6c305c9c51a32fca503dbb2e0771.zip |
Move InventoryRecv::getSlot form ea namespace into tmwa and eathena.
Diffstat (limited to 'src/net/ea')
-rw-r--r-- | src/net/ea/inventoryrecv.cpp | 44 | ||||
-rw-r--r-- | src/net/ea/inventoryrecv.h | 2 |
2 files changed, 0 insertions, 46 deletions
diff --git a/src/net/ea/inventoryrecv.cpp b/src/net/ea/inventoryrecv.cpp index f1593bf51..830675a44 100644 --- a/src/net/ea/inventoryrecv.cpp +++ b/src/net/ea/inventoryrecv.cpp @@ -50,32 +50,6 @@ namespace Ea namespace InventoryRecv { - const EquipSlot::Type EQUIP_POINTS[EquipSlot::VECTOREND] = - { - EquipSlot::LEGS_SLOT, // Lower Headgear - EquipSlot::FIGHT1_SLOT, // Weapon - EquipSlot::GLOVES_SLOT, // Garment - EquipSlot::RING2_SLOT, // Accessory 1 - EquipSlot::RING1_SLOT, // Armor - EquipSlot::FIGHT2_SLOT, // Shield - EquipSlot::FEET_SLOT, // Footgear - EquipSlot::NECK_SLOT, // Accessory 2 - EquipSlot::HEAD_SLOT, // Upper Headgear - EquipSlot::TORSO_SLOT, // Middle Headgear - EquipSlot::EVOL_RING1_SLOT, // Costume Top Headgear - EquipSlot::EVOL_RING2_SLOT, // Costume Mid Headgear - EquipSlot::PROJECTILE_SLOT, // Costume Low Headgear - EquipSlot::COSTUME_ROBE_SLOT, // Costume Garment/Robe - EquipSlot::MISSING1_SLOT, // Missing slot 1 - EquipSlot::MISSING2_SLOT, // Missing slot 2 - EquipSlot::SHADOW_ARMOR_SLOT, // Shadow Armor - EquipSlot::SHADOW_WEAPON_SLOT, // Shadow Weapon - EquipSlot::SHADOW_SHIELD_SLOT, // Shadow Shield - EquipSlot::SHADOW_SHOES_SLOT, // Shadow Shoes - EquipSlot::SHADOW_ACCESSORY2_SLOT, // Shadow Accessory 2 - EquipSlot::SHADOW_ACCESSORY1_SLOT, // Shadow Accessory 1 - }; - EquipBackend mEquips; InventoryItems mInventoryItems; Inventory *mStorage = nullptr; @@ -217,22 +191,4 @@ void InventoryRecv::processPlayerArrowEquip(Net::MessageIn &msg) BLOCK_END("InventoryRecv::processPlayerArrowEquip") } -int InventoryRecv::getSlot(const int eAthenaSlot) -{ - if (eAthenaSlot == 0) - return EquipSlot::VECTOREND; - - if (eAthenaSlot & 0x8000) - return inventoryHandler->getProjectileSlot(); - - unsigned int mask = 1; - int position = 0; - while (!(eAthenaSlot & mask)) - { - mask <<= 1; - position++; - } - return CAST_S32(EQUIP_POINTS[position]); -} - } // namespace Ea diff --git a/src/net/ea/inventoryrecv.h b/src/net/ea/inventoryrecv.h index 954a5216e..472dc8362 100644 --- a/src/net/ea/inventoryrecv.h +++ b/src/net/ea/inventoryrecv.h @@ -58,8 +58,6 @@ namespace Ea void processPlayerStorageClose(Net::MessageIn &msg); void processPlayerAttackRange(Net::MessageIn &msg); void processPlayerArrowEquip(Net::MessageIn &msg); - - int getSlot(const int eAthenaSlot) A_WARN_UNUSED; } // namespace InventoryRecv } // namespace Ea |