diff options
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/being/localplayer.cpp | 5 | ||||
| -rw-r--r-- | src/gui/windows/equipmentwindow.cpp | 3 | ||||
| -rw-r--r-- | src/resources/iteminfo.h | 31 | ||||
| -rw-r--r-- | src/resources/itemslot.h | 59 |
6 files changed, 66 insertions, 34 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d31035579..1a6f2cacc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -552,6 +552,7 @@ SET(SRCS resources/db/itemdb.h resources/iteminfo.h resources/iteminfo.cpp + resources/itemslot.h resources/db/mapdb.cpp resources/db/mapdb.h resources/db/moddb.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 599f66026..4fefd63eb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -659,6 +659,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ resources/db/itemdb.h \ resources/iteminfo.h \ resources/iteminfo.cpp \ + resources/itemslot.h \ resources/db/mapdb.cpp \ resources/db/mapdb.h \ resources/db/moddb.cpp \ 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); diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index 0a18cd20f..4d90899b5 100644 --- a/src/gui/windows/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -45,6 +45,7 @@ #include "gui/widgets/playerbox.h" #include "resources/imageset.h" +#include "resources/itemslot.h" #include "utils/delete2.h" #include "utils/dtor.h" @@ -240,7 +241,7 @@ void EquipmentWindow::draw(Graphics *graphics) // with maximum opacity graphics->drawImage(image, box->x + mItemPadding, box->y + mItemPadding); - if (i == EQUIP_PROJECTILE_SLOT) + if (i == ItemSlot::PROJECTILE_SLOT) { graphics->setColorAll(mLabelsColor, mLabelsColor2); const std::string str = toString(item->getQuantity()); diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 4ea61664d..8d8d18845 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -36,37 +36,6 @@ namespace ColorDB class ItemColor; } -enum EquipmentSlot -{ - // Equipment rules: - // 1 Brest equipment - EQUIP_TORSO_SLOT = 0, - // 1 arms equipment - EQUIP_ARMS_SLOT = 1, - // 1 head equipment - EQUIP_HEAD_SLOT = 2, - // 1 legs equipment - EQUIP_LEGS_SLOT = 3, - // 1 feet equipment - EQUIP_FEET_SLOT = 4, - // 2 rings - EQUIP_RING1_SLOT = 5, - EQUIP_RING2_SLOT = 6, - // 1 necklace - EQUIP_NECKLACE_SLOT = 7, - // Fight: - // 2 one-handed weapons - // or 1 two-handed weapon - // or 1 one-handed weapon + 1 shield. - EQUIP_FIGHT1_SLOT = 8, - EQUIP_FIGHT2_SLOT = 9, - // Projectile: - // this item does not amount to one, it only - // indicates the chosen projectile. - EQUIP_PROJECTILE_SLOT = 10 -}; - - /** * Enumeration of available Item types. */ diff --git a/src/resources/itemslot.h b/src/resources/itemslot.h new file mode 100644 index 000000000..187eb139f --- /dev/null +++ b/src/resources/itemslot.h @@ -0,0 +1,59 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef RESOURCES_ITEMSLOT_H +#define RESOURCES_ITEMSLOT_H + +namespace ItemSlot +{ + enum Type + { + // Equipment rules: + // 1 Brest equipment + TORSO_SLOT = 0, + // 1 arms equipment + ARMS_SLOT = 1, + // 1 head equipment + HEAD_SLOT = 2, + // 1 legs equipment + LEGS_SLOT = 3, + // 1 feet equipment + FEET_SLOT = 4, + // 2 rings + RING1_SLOT = 5, + RING2_SLOT = 6, + // 1 necklace + NECKLACE_SLOT = 7, + // Fight: + // 2 one-handed weapons + // or 1 two-handed weapon + // or 1 one-handed weapon + 1 shield. + FIGHT1_SLOT = 8, + FIGHT2_SLOT = 9, + // Projectile: + // this item does not amount to one, it only + // indicates the chosen projectile. + PROJECTILE_SLOT = 10 + }; +} + +#endif // RESOURCES_ITEMSLOT_H |