diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-03-21 19:37:01 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-03-21 19:37:01 +0300 |
commit | 8800940bb4b94f6dab7dcf80bf0abc3e3b09e35f (patch) | |
tree | cac057743c1b48db050dbfdad37809afa728b054 /src/resources | |
parent | 542d2ba78d84e0fa051e0620ccab5fb3a0c711e3 (diff) | |
download | manaverse-8800940bb4b94f6dab7dcf80bf0abc3e3b09e35f.tar.gz manaverse-8800940bb4b94f6dab7dcf80bf0abc3e3b09e35f.tar.bz2 manaverse-8800940bb4b94f6dab7dcf80bf0abc3e3b09e35f.tar.xz manaverse-8800940bb4b94f6dab7dcf80bf0abc3e3b09e35f.zip |
Add support for using fields from status effects: option, opt1, opt2, opt3.
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/db/statuseffectdb.cpp | 43 | ||||
-rw-r--r-- | src/resources/db/statuseffectdb.h | 12 |
2 files changed, 50 insertions, 5 deletions
diff --git a/src/resources/db/statuseffectdb.cpp b/src/resources/db/statuseffectdb.cpp index 4390f79fe..cd7267fe2 100644 --- a/src/resources/db/statuseffectdb.cpp +++ b/src/resources/db/statuseffectdb.cpp @@ -23,6 +23,7 @@ #include "resources/db/statuseffectdb.h" #include "configuration.h" +#include "settings.h" #include "soundmanager.h" #include "statuseffect.h" @@ -45,12 +46,12 @@ namespace typedef std::map<int, StatusEffect *> IdToEffectMap[2]; bool mLoaded = false; IdToEffectMap statusEffects; - std::map<int, int> optionToIdMap; - std::map<int, int> opt1ToIdMap; - std::map<int, int> opt2ToIdMap; - std::map<int, int> opt3ToIdMap; + OptionsMap optionToIdMap; + OptionsMap opt1ToIdMap; + OptionsMap opt2ToIdMap; + OptionsMap opt3ToIdMap; - std::map<int, int> blockIdToIdMap; + OptionsMap blockIdToIdMap; } // namespace int StatusEffectDB::blockIdToId(const int blockIndex) @@ -126,13 +127,25 @@ void StatusEffectDB::loadXmlFile(const std::string &fileName) const int opt2 = XML::getProperty(node, "opt2", 0); const int opt3 = XML::getProperty(node, "opt3", 0); if (option != 0) + { optionToIdMap[option] = id; + settings.legacyEffects = false; + } if (opt1 != 0) + { opt1ToIdMap[opt1] = id; + settings.legacyEffects = false; + } if (opt2 != 0) + { opt2ToIdMap[opt2] = id; + settings.legacyEffects = false; + } if (opt3 != 0) + { opt3ToIdMap[opt3] = id; + settings.legacyEffects = false; + } StatusEffect *startEffect = statusEffects[1][id]; StatusEffect *endEffect = statusEffects[0][id]; @@ -208,3 +221,23 @@ void StatusEffectDB::unload() mLoaded = false; } + +const OptionsMap& StatusEffectDB::getOptionMap() +{ + return optionToIdMap; +} + +const OptionsMap& StatusEffectDB::getOpt1Map() +{ + return opt1ToIdMap; +} + +const OptionsMap& StatusEffectDB::getOpt2Map() +{ + return opt2ToIdMap; +} + +const OptionsMap& StatusEffectDB::getOpt3Map() +{ + return opt3ToIdMap; +} diff --git a/src/resources/db/statuseffectdb.h b/src/resources/db/statuseffectdb.h index 6e39c9053..64dca44b2 100644 --- a/src/resources/db/statuseffectdb.h +++ b/src/resources/db/statuseffectdb.h @@ -25,12 +25,16 @@ #include "enums/simpletypes/enable.h" +#include <map> #include <string> #include "localconsts.h" class StatusEffect; +typedef std::map<int, int> OptionsMap; +typedef OptionsMap::const_iterator OptionsMapCIter; + namespace StatusEffectDB { /** @@ -57,6 +61,14 @@ namespace StatusEffectDB void loadXmlFile(const std::string &fileName); void unload(); + + const OptionsMap& getOptionMap(); + + const OptionsMap& getOpt1Map(); + + const OptionsMap& getOpt2Map(); + + const OptionsMap& getOpt3Map(); } // namespace StatusEffectDB #endif // RESOURCES_DB_STATUSEFFECTDB_H |