diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-06-29 21:06:30 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-06-30 00:03:20 +0300 |
| commit | e2c1b87e38e5c921912b334ca971e92b7989f8a8 (patch) | |
| tree | eb95d5d620c5318403bafd014738906c3d602adf /src/resources/db | |
| parent | 370a8245ae3fbbfe449000b6bdaab366d08d925e (diff) | |
| download | mv-e2c1b87e38e5c921912b334ca971e92b7989f8a8.tar.gz mv-e2c1b87e38e5c921912b334ca971e92b7989f8a8.tar.bz2 mv-e2c1b87e38e5c921912b334ca971e92b7989f8a8.tar.xz mv-e2c1b87e38e5c921912b334ca971e92b7989f8a8.zip | |
Rename ItemDb::Stat into BasicStat.
Diffstat (limited to 'src/resources/db')
| -rw-r--r-- | src/resources/db/itemdb.cpp | 6 | ||||
| -rw-r--r-- | src/resources/db/statdb.cpp | 16 | ||||
| -rw-r--r-- | src/resources/db/statdb.h | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index b35290639..4218771d6 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -28,7 +28,7 @@ #include "enums/resources/spritedirection.h" -#include "resources/itemdbstat.h" +#include "resources/basicstat.h" #include "resources/iteminfo.h" #include "resources/itemtypemapdata.h" @@ -513,8 +513,8 @@ void ItemDB::loadXmlFile(const std::string &fileName, std::string effect; readFields(effect, node, requiredFields); readFields(effect, node, addFields); - const std::vector<Stat> &extraStats = StatDb::getExtraStats(); - FOR_EACH (std::vector<Stat>::const_iterator, it, extraStats) + const std::vector<BasicStat> &extraStats = StatDb::getExtraStats(); + FOR_EACH (std::vector<BasicStat>::const_iterator, it, extraStats) { std::string value = XML::getProperty( node, it->tag.c_str(), ""); diff --git a/src/resources/db/statdb.cpp b/src/resources/db/statdb.cpp index 41c4b6c44..0d25b07dd 100644 --- a/src/resources/db/statdb.cpp +++ b/src/resources/db/statdb.cpp @@ -36,26 +36,26 @@ namespace { bool mLoaded = false; - static std::vector<ItemDB::Stat> mBasicStats; + static std::vector<BasicStat> mBasicStats; } // namespace void StatDb::addBasicStats() { // TRANSLATORS: player stat - mBasicStats.push_back(ItemDB::Stat("str", _("Strength %s"))); + mBasicStats.push_back(BasicStat("str", _("Strength %s"))); // TRANSLATORS: player stat - mBasicStats.push_back(ItemDB::Stat("agi", _("Agility %s"))); + mBasicStats.push_back(BasicStat("agi", _("Agility %s"))); // TRANSLATORS: player stat - mBasicStats.push_back(ItemDB::Stat("vit", _("Vitality %s"))); + mBasicStats.push_back(BasicStat("vit", _("Vitality %s"))); // TRANSLATORS: player stat - mBasicStats.push_back(ItemDB::Stat("int", _("Intelligence %s"))); + mBasicStats.push_back(BasicStat("int", _("Intelligence %s"))); // TRANSLATORS: player stat - mBasicStats.push_back(ItemDB::Stat("dex", _("Dexterity %s"))); + mBasicStats.push_back(BasicStat("dex", _("Dexterity %s"))); // TRANSLATORS: player stat - mBasicStats.push_back(ItemDB::Stat("luck", _("Luck %s"))); + mBasicStats.push_back(BasicStat("luck", _("Luck %s"))); } -const std::vector<ItemDB::Stat> &StatDb::getExtraStats() +const std::vector<BasicStat> &StatDb::getExtraStats() { return mBasicStats; } diff --git a/src/resources/db/statdb.h b/src/resources/db/statdb.h index 475de6095..5a5d3920a 100644 --- a/src/resources/db/statdb.h +++ b/src/resources/db/statdb.h @@ -23,7 +23,7 @@ #include "enums/simpletypes/skiperror.h" -#include "resources/itemdbstat.h" +#include "resources/basicstat.h" #include <string> #include <vector> @@ -41,7 +41,7 @@ namespace StatDb void addBasicStats(); - const std::vector<ItemDB::Stat> &getExtraStats(); + const std::vector<BasicStat> &getExtraStats(); } // namespace StatDb #endif // RESOURCES_DB_STATDB_H |