From ca0ca278d0c4aed9a6d50bb9a8982f5261151ab8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 24 Mar 2016 20:51:36 +0300 Subject: Rename enum ItemType into ItemDbType. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/being/playerinfo.cpp | 2 +- src/enums/resources/itemdbtype.h | 50 +++++++++++++++++++++++++++++++++++++++ src/enums/resources/itemtype.h | 50 --------------------------------------- src/gui/popups/itempopup.cpp | 39 +++++++++++++++--------------- src/gui/popups/itempopup.h | 6 ++--- src/gui/widgets/itemcontainer.cpp | 4 ++-- src/gui/windows/buydialog.cpp | 4 ++-- src/resources/db/itemdb.cpp | 42 ++++++++++++++++---------------- src/resources/iteminfo.cpp | 2 +- src/resources/iteminfo.h | 8 +++---- src/resources/itemtypemap.h | 4 ++-- src/resources/itemtypemapdata.h | 38 ++++++++++++++--------------- 14 files changed, 127 insertions(+), 126 deletions(-) create mode 100644 src/enums/resources/itemdbtype.h delete mode 100644 src/enums/resources/itemtype.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 92df48845..a93e156fd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -663,8 +663,8 @@ SET(SRCS resources/iteminfo.cpp resources/itemslot.h enums/resources/imageposition.h + enums/resources/itemdbtype.h enums/resources/itemsoundevent.h - enums/resources/itemtype.h resources/itemtypemap.h resources/itemtypemapdata.h resources/db/mapdb.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 02dae31ce..d1f09f575 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1196,8 +1196,8 @@ manaplus_SOURCES += main.cpp \ resources/iteminfo.cpp \ resources/itemslot.h \ enums/resources/imageposition.h \ + enums/resources/itemdbtype.h \ enums/resources/itemsoundevent.h \ - enums/resources/itemtype.h \ resources/itemtypemap.h \ resources/itemtypemapdata.h \ resources/mapinfo.h \ diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp index dbffe8b3e..04bb267aa 100644 --- a/src/being/playerinfo.cpp +++ b/src/being/playerinfo.cpp @@ -31,7 +31,7 @@ #include "being/mercenaryinfo.h" #include "being/petinfo.h" -#include "enums/resources/itemtype.h" +#include "enums/resources/itemdbtype.h" #endif #include "gui/windows/inventorywindow.h" diff --git a/src/enums/resources/itemdbtype.h b/src/enums/resources/itemdbtype.h new file mode 100644 index 000000000..67c634837 --- /dev/null +++ b/src/enums/resources/itemdbtype.h @@ -0,0 +1,50 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2016 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 . + */ + +#ifndef RESOURCES_ITEMDBTYPE_H +#define RESOURCES_ITEMDBTYPE_H + +#include "enums/simpletypes/enumdefines.h" + +enumStart(ItemDbType) +{ + UNUSABLE = 0, + USABLE, + EQUIPMENT_ONE_HAND_WEAPON, + EQUIPMENT_TWO_HANDS_WEAPON, + EQUIPMENT_TORSO, + EQUIPMENT_ARMS, // 5 + CARD, + EQUIPMENT_HEAD, + EQUIPMENT_LEGS, + EQUIPMENT_SHIELD, + EQUIPMENT_RING, + EQUIPMENT_NECKLACE, // 10 + EQUIPMENT_FEET, + EQUIPMENT_AMMO, + EQUIPMENT_CHARM, + SPRITE_RACE, + SPRITE_HAIR // 15 +} +enumEnd(ItemDbType); + +#endif // RESOURCES_ITEMDBTYPE_H diff --git a/src/enums/resources/itemtype.h b/src/enums/resources/itemtype.h deleted file mode 100644 index 29ad14b54..000000000 --- a/src/enums/resources/itemtype.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2016 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 . - */ - -#ifndef RESOURCES_ITEMTYPE_H -#define RESOURCES_ITEMTYPE_H - -#include "enums/simpletypes/enumdefines.h" - -enumStart(ItemType) -{ - UNUSABLE = 0, - USABLE, - EQUIPMENT_ONE_HAND_WEAPON, - EQUIPMENT_TWO_HANDS_WEAPON, - EQUIPMENT_TORSO, - EQUIPMENT_ARMS, // 5 - CARD, - EQUIPMENT_HEAD, - EQUIPMENT_LEGS, - EQUIPMENT_SHIELD, - EQUIPMENT_RING, - EQUIPMENT_NECKLACE, // 10 - EQUIPMENT_FEET, - EQUIPMENT_AMMO, - EQUIPMENT_CHARM, - SPRITE_RACE, - SPRITE_HAIR // 15 -} -enumEnd(ItemType); - -#endif // RESOURCES_ITEMTYPE_H diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp index 065704cb8..c1d414539 100644 --- a/src/gui/popups/itempopup.cpp +++ b/src/gui/popups/itempopup.cpp @@ -57,7 +57,7 @@ ItemPopup::ItemPopup() : mItemEffect(new TextBox(this)), mItemWeight(new TextBox(this)), mItemCards(new TextBox(this)), - mItemType(ItemType::UNUSABLE), + mItemType(ItemDbType::UNUSABLE), mIcon(new Icon(this, nullptr)), mLastName(), mLastId(0), @@ -325,29 +325,30 @@ std::string ItemPopup::getCardsString(const int *const cards) return label->setForegroundColorAll(getThemeColor(name2), \ getThemeColor(name2##_OUTLINE)); \ } -void ItemPopup::setLabelColor(Label *label, const ItemTypeT type) const +void ItemPopup::setLabelColor(Label *label, + const ItemDbTypeT type) const { switch (type) { - caseSetColor(ItemType::UNUSABLE, ThemeColorId::GENERIC) - caseSetColor(ItemType::USABLE, ThemeColorId::USABLE) - caseSetColor(ItemType::EQUIPMENT_ONE_HAND_WEAPON, + caseSetColor(ItemDbType::UNUSABLE, ThemeColorId::GENERIC) + caseSetColor(ItemDbType::USABLE, ThemeColorId::USABLE) + caseSetColor(ItemDbType::EQUIPMENT_ONE_HAND_WEAPON, ThemeColorId::ONEHAND) - caseSetColor(ItemType::EQUIPMENT_TWO_HANDS_WEAPON, + caseSetColor(ItemDbType::EQUIPMENT_TWO_HANDS_WEAPON, ThemeColorId::TWOHAND) - caseSetColor(ItemType::EQUIPMENT_TORSO, ThemeColorId::TORSO) - caseSetColor(ItemType::EQUIPMENT_ARMS, ThemeColorId::ARMS) - caseSetColor(ItemType::EQUIPMENT_HEAD, ThemeColorId::HEAD) - caseSetColor(ItemType::EQUIPMENT_LEGS, ThemeColorId::LEGS) - caseSetColor(ItemType::EQUIPMENT_SHIELD, ThemeColorId::SHIELD) - caseSetColor(ItemType::EQUIPMENT_RING, ThemeColorId::RING) - caseSetColor(ItemType::EQUIPMENT_NECKLACE, ThemeColorId::NECKLACE) - caseSetColor(ItemType::EQUIPMENT_FEET, ThemeColorId::FEET) - caseSetColor(ItemType::EQUIPMENT_AMMO, ThemeColorId::AMMO) - caseSetColor(ItemType::EQUIPMENT_CHARM, ThemeColorId::CHARM) - caseSetColor(ItemType::SPRITE_RACE, ThemeColorId::UNKNOWN_ITEM) - caseSetColor(ItemType::SPRITE_HAIR, ThemeColorId::UNKNOWN_ITEM) - caseSetColor(ItemType::CARD, ThemeColorId::CARD) + caseSetColor(ItemDbType::EQUIPMENT_TORSO, ThemeColorId::TORSO) + caseSetColor(ItemDbType::EQUIPMENT_ARMS, ThemeColorId::ARMS) + caseSetColor(ItemDbType::EQUIPMENT_HEAD, ThemeColorId::HEAD) + caseSetColor(ItemDbType::EQUIPMENT_LEGS, ThemeColorId::LEGS) + caseSetColor(ItemDbType::EQUIPMENT_SHIELD, ThemeColorId::SHIELD) + caseSetColor(ItemDbType::EQUIPMENT_RING, ThemeColorId::RING) + caseSetColor(ItemDbType::EQUIPMENT_NECKLACE, ThemeColorId::NECKLACE) + caseSetColor(ItemDbType::EQUIPMENT_FEET, ThemeColorId::FEET) + caseSetColor(ItemDbType::EQUIPMENT_AMMO, ThemeColorId::AMMO) + caseSetColor(ItemDbType::EQUIPMENT_CHARM, ThemeColorId::CHARM) + caseSetColor(ItemDbType::SPRITE_RACE, ThemeColorId::UNKNOWN_ITEM) + caseSetColor(ItemDbType::SPRITE_HAIR, ThemeColorId::UNKNOWN_ITEM) + caseSetColor(ItemDbType::CARD, ThemeColorId::CARD) default: { return label->setForegroundColorAll(getThemeColor( diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h index fc0320614..f862d2754 100644 --- a/src/gui/popups/itempopup.h +++ b/src/gui/popups/itempopup.h @@ -24,7 +24,7 @@ #ifndef GUI_POPUPS_ITEMPOPUP_H #define GUI_POPUPS_ITEMPOPUP_H -#include "enums/resources/itemtype.h" +#include "enums/resources/itemdbtype.h" #include "enums/simpletypes/itemcolor.h" @@ -82,14 +82,14 @@ class ItemPopup final : public Popup TextBox *mItemEffect A_NONNULLPOINTER; TextBox *mItemWeight A_NONNULLPOINTER; TextBox *mItemCards A_NONNULLPOINTER; - ItemTypeT mItemType; + ItemDbTypeT mItemType; Icon *mIcon A_NONNULLPOINTER; std::string mLastName; int mLastId; ItemColor mLastColor; void setLabelColor(Label *label, - const ItemTypeT type) const A_NONNULL(2); + const ItemDbTypeT type) const A_NONNULL(2); }; extern ItemPopup *itemPopup; diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 96bdb1dcc..f7f7ceb96 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -158,8 +158,8 @@ namespace const ItemInfo &info1 = pair1->mItem->getInfo(); const ItemInfo &info2 = pair2->mItem->getInfo(); - const ItemTypeT t1 = info1.getType(); - const ItemTypeT t2 = info2.getType(); + const ItemDbTypeT t1 = info1.getType(); + const ItemDbTypeT t2 = info2.getType(); if (t1 == t2) { return (info1.getName() < info2.getName()); diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp index c6be959de..b0cf5bc8c 100644 --- a/src/gui/windows/buydialog.cpp +++ b/src/gui/windows/buydialog.cpp @@ -160,8 +160,8 @@ namespace if (!item1 || !item2) return false; - const ItemTypeT type1 = item1->getInfo().getType(); - const ItemTypeT type2 = item2->getInfo().getType(); + const ItemDbTypeT type1 = item1->getInfo().getType(); + const ItemDbTypeT type2 = item2->getInfo().getType(); if (type1 == type2) return item1->getPrice() < item2->getPrice(); return type1 < type2; diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index 3ef3c8bd4..a860dc8e5 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -173,7 +173,7 @@ void ItemDB::setStatsList(const std::vector &stats) extraStats = stats; } -static ItemTypeT itemTypeFromString(const std::string &name) +static ItemDbTypeT itemTypeFromString(const std::string &name) { const size_t sz = sizeof(itemTypeMap) / sizeof(itemTypeMap[0]); for (size_t f = 0; f < sz; f ++) @@ -183,10 +183,10 @@ static ItemTypeT itemTypeFromString(const std::string &name) return type.type; } logger->log("Unknown item type: " + name); - return ItemType::UNUSABLE; + return ItemDbType::UNUSABLE; } -static std::string useButtonFromItemType(const ItemTypeT &type) +static std::string useButtonFromItemType(const ItemDbTypeT &type) { const size_t sz = sizeof(itemTypeMap) / sizeof(itemTypeMap[0]); for (size_t f = 0; f < sz; f ++) @@ -203,7 +203,7 @@ static std::string useButtonFromItemType(const ItemTypeT &type) return std::string(); } -static std::string useButton2FromItemType(const ItemTypeT &type) +static std::string useButton2FromItemType(const ItemDbTypeT &type) { const size_t sz = sizeof(itemTypeMap) / sizeof(itemTypeMap[0]); for (size_t f = 0; f < sz; f ++) @@ -464,28 +464,28 @@ void ItemDB::loadXmlFile(const std::string &fileName, int &tagNum) switch (itemInfo->getType()) { - case ItemType::USABLE: + case ItemDbType::USABLE: itemInfo->addTag(mTags["Usable"]); break; - case ItemType::CARD: - case ItemType::UNUSABLE: + case ItemDbType::CARD: + case ItemDbType::UNUSABLE: itemInfo->addTag(mTags["Unusable"]); break; default: - case ItemType::EQUIPMENT_ONE_HAND_WEAPON: - case ItemType::EQUIPMENT_TWO_HANDS_WEAPON: - case ItemType::EQUIPMENT_TORSO: - case ItemType::EQUIPMENT_ARMS: - case ItemType::EQUIPMENT_HEAD: - case ItemType::EQUIPMENT_LEGS: - case ItemType::EQUIPMENT_SHIELD: - case ItemType::EQUIPMENT_RING: - case ItemType::EQUIPMENT_NECKLACE: - case ItemType::EQUIPMENT_FEET: - case ItemType::EQUIPMENT_AMMO: - case ItemType::EQUIPMENT_CHARM: - case ItemType::SPRITE_RACE: - case ItemType::SPRITE_HAIR: + case ItemDbType::EQUIPMENT_ONE_HAND_WEAPON: + case ItemDbType::EQUIPMENT_TWO_HANDS_WEAPON: + case ItemDbType::EQUIPMENT_TORSO: + case ItemDbType::EQUIPMENT_ARMS: + case ItemDbType::EQUIPMENT_HEAD: + case ItemDbType::EQUIPMENT_LEGS: + case ItemDbType::EQUIPMENT_SHIELD: + case ItemDbType::EQUIPMENT_RING: + case ItemDbType::EQUIPMENT_NECKLACE: + case ItemDbType::EQUIPMENT_FEET: + case ItemDbType::EQUIPMENT_AMMO: + case ItemDbType::EQUIPMENT_CHARM: + case ItemDbType::SPRITE_RACE: + case ItemDbType::SPRITE_HAIR: itemInfo->addTag(mTags["Equipment"]); break; } diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index 79f0e04b5..1de4d9579 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -45,7 +45,7 @@ ItemInfo::ItemInfo() : mEffect(), mUseButton(), mUseButton2(), - mType(ItemType::UNUSABLE), + mType(ItemDbType::UNUSABLE), mWeight(0), mView(0), mId(0), diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index f9c622d3f..ad9a2d6ab 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -25,7 +25,7 @@ #include "enums/being/gender.h" -#include "enums/resources/itemtype.h" +#include "enums/resources/itemdbtype.h" #include "enums/simpletypes/beingtypeid.h" #include "enums/simpletypes/itemcolor.h" @@ -100,7 +100,7 @@ class ItemInfo final const std::string &getEffect() const A_WARN_UNUSED { return mEffect; } - void setType(const ItemTypeT type) + void setType(const ItemDbTypeT type) { mType = type; } void setUseButton(const std::string &str) @@ -115,7 +115,7 @@ class ItemInfo final const std::string &getUseButton2() const A_WARN_UNUSED { return mUseButton2; } - ItemTypeT getType() const A_WARN_UNUSED + ItemDbTypeT getType() const A_WARN_UNUSED { return mType; } void setWeight(const int weight) @@ -329,7 +329,7 @@ class ItemInfo final std::string mEffect; /**< Description of effects. */ std::string mUseButton; std::string mUseButton2; - ItemTypeT mType; /**< Item type. */ + ItemDbTypeT mType; /**< Item type. */ int mWeight; /**< Weight in grams. */ int mView; /**< Item ID of how this item looks. */ int mId; /**< Item ID */ diff --git a/src/resources/itemtypemap.h b/src/resources/itemtypemap.h index 6718c8413..c2866d430 100644 --- a/src/resources/itemtypemap.h +++ b/src/resources/itemtypemap.h @@ -21,7 +21,7 @@ #ifndef RESOURCES_ITEMTYPEMAP_H #define RESOURCES_ITEMTYPEMAP_H -#include "enums/resources/itemtype.h" +#include "enums/resources/itemdbtype.h" #include @@ -30,7 +30,7 @@ struct ItemTypeMap final { std::string name; - ItemTypeT type; + ItemDbTypeT type; std::string useButton; std::string useButton2; }; diff --git a/src/resources/itemtypemapdata.h b/src/resources/itemtypemapdata.h index 250bf1835..19f8f658a 100644 --- a/src/resources/itemtypemapdata.h +++ b/src/resources/itemtypemapdata.h @@ -29,77 +29,77 @@ ItemTypeMap itemTypeMap[] = { - {"generic", ItemType::UNUSABLE, + {"generic", ItemDbType::UNUSABLE, std::string(), std::string() }, - {"other", ItemType::UNUSABLE, + {"other", ItemDbType::UNUSABLE, // TRANSLATORS: inventory button N_("Use"), N_("Use") }, - {"usable", ItemType::USABLE, + {"usable", ItemDbType::USABLE, // TRANSLATORS: inventory button N_("Use"), N_("Use") }, - {"equip-1hand", ItemType::EQUIPMENT_ONE_HAND_WEAPON, + {"equip-1hand", ItemDbType::EQUIPMENT_ONE_HAND_WEAPON, // TRANSLATORS: inventory button N_("Equip"), N_("Unequip") }, - {"equip-2hand", ItemType::EQUIPMENT_TWO_HANDS_WEAPON, + {"equip-2hand", ItemDbType::EQUIPMENT_TWO_HANDS_WEAPON, // TRANSLATORS: inventory button N_("Equip"), N_("Unequip") }, - {"equip-torso", ItemType::EQUIPMENT_TORSO, + {"equip-torso", ItemDbType::EQUIPMENT_TORSO, // TRANSLATORS: inventory button N_("Equip"), N_("Unequip") }, - {"equip-arms", ItemType::EQUIPMENT_ARMS, + {"equip-arms", ItemDbType::EQUIPMENT_ARMS, // TRANSLATORS: inventory button N_("Equip"), N_("Unequip") }, - {"equip-head", ItemType::EQUIPMENT_HEAD, + {"equip-head", ItemDbType::EQUIPMENT_HEAD, // TRANSLATORS: inventory button N_("Equip"), N_("Unequip") }, - {"equip-legs", ItemType::EQUIPMENT_LEGS, + {"equip-legs", ItemDbType::EQUIPMENT_LEGS, // TRANSLATORS: inventory button N_("Equip"), N_("Unequip") }, - {"equip-shield", ItemType::EQUIPMENT_SHIELD, + {"equip-shield", ItemDbType::EQUIPMENT_SHIELD, // TRANSLATORS: inventory button N_("Equip"), N_("Unequip") }, - {"equip-ring", ItemType::EQUIPMENT_RING, + {"equip-ring", ItemDbType::EQUIPMENT_RING, // TRANSLATORS: inventory button N_("Equip"), N_("Unequip") }, - {"equip-charm", ItemType::EQUIPMENT_CHARM, + {"equip-charm", ItemDbType::EQUIPMENT_CHARM, // TRANSLATORS: inventory button N_("Equip"), N_("Unequip") }, - {"equip-necklace", ItemType::EQUIPMENT_NECKLACE, + {"equip-necklace", ItemDbType::EQUIPMENT_NECKLACE, // TRANSLATORS: inventory button N_("Equip"), N_("Unequip") }, - {"equip-neck", ItemType::EQUIPMENT_NECKLACE, + {"equip-neck", ItemDbType::EQUIPMENT_NECKLACE, // TRANSLATORS: inventory button N_("Equip"), N_("Unequip") }, - {"equip-feet", ItemType::EQUIPMENT_FEET, + {"equip-feet", ItemDbType::EQUIPMENT_FEET, // TRANSLATORS: inventory button N_("Equip"), N_("Unequip") }, - {"equip-ammo", ItemType::EQUIPMENT_AMMO, + {"equip-ammo", ItemDbType::EQUIPMENT_AMMO, // TRANSLATORS: inventory button N_("Equip"), N_("Unequip") }, - {"card", ItemType::CARD, + {"card", ItemDbType::CARD, // TRANSLATORS: inventory button N_("Insert"), std::string() }, - {"racesprite", ItemType::SPRITE_RACE, + {"racesprite", ItemDbType::SPRITE_RACE, std::string(), std::string() }, - {"hairsprite", ItemType::SPRITE_HAIR, + {"hairsprite", ItemDbType::SPRITE_HAIR, std::string(), std::string() } }; -- cgit v1.2.3-60-g2f50