diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-01-04 15:50:56 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-01-04 15:50:56 +0300 |
| commit | d0adcf0e3c8a1db5e06bbbb8ae950ea5ebeeb8eb (patch) | |
| tree | 33e51821fd54d88d46df4e328f60ba148971ca55 /src/actormanager.h | |
| parent | 39cec87cfa8b1605239f4b06388bbb07f2a16a89 (diff) | |
| download | mv-d0adcf0e3c8a1db5e06bbbb8ae950ea5ebeeb8eb.tar.gz mv-d0adcf0e3c8a1db5e06bbbb8ae950ea5ebeeb8eb.tar.bz2 mv-d0adcf0e3c8a1db5e06bbbb8ae950ea5ebeeb8eb.tar.xz mv-d0adcf0e3c8a1db5e06bbbb8ae950ea5ebeeb8eb.zip | |
Add stringmap typedefs.
Diffstat (limited to 'src/actormanager.h')
| -rw-r--r-- | src/actormanager.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/actormanager.h b/src/actormanager.h index b9799d614..c3fc8d195 100644 --- a/src/actormanager.h +++ b/src/actormanager.h @@ -27,6 +27,7 @@ #include "listeners/configlistener.h" +#include "utils/stringmap.h" #include "utils/stringvector.h" #include "localconsts.h" @@ -289,12 +290,10 @@ class ActorManager final: public ConfigListener defList(Pickup, Items) defList(IgnorePickup, Items) - const std::map<std::string, int> &getAttackMobsMap() - const A_WARN_UNUSED + const StringIntMap &getAttackMobsMap() const A_WARN_UNUSED { return mAttackMobsMap; } - const std::map<std::string, int> &getPriorityAttackMobsMap() - const A_WARN_UNUSED + const StringIntMap &getPriorityAttackMobsMap() const A_WARN_UNUSED { return mPriorityAttackMobsMap; } int getAttackMobIndex(const std::string &name) const A_WARN_UNUSED; @@ -305,7 +304,7 @@ class ActorManager final: public ConfigListener int getPickupItemIndex(const std::string &name) const A_WARN_UNUSED; static int getIndexByName(const std::string &name, - const std::map<std::string, int> &map) + const StringIntMap &map) A_WARN_UNUSED; bool checkForPickup(const FloorItem *const item) const A_WARN_UNUSED; @@ -349,12 +348,12 @@ class ActorManager final: public ConfigListener #define defVarsP(mob) \ std::list<std::string> mPriority##mob;\ std::set<std::string> mPriority##mob##Set;\ - std::map<std::string, int> mPriority##mob##Map; + StringIntMap mPriority##mob##Map; #define defVars(mob) \ std::list<std::string> m##mob;\ std::set<std::string> m##mob##Set;\ - std::map<std::string, int> m##mob##Map;\ + StringIntMap m##mob##Map;\ std::list<std::string> mIgnore##mob;\ std::set<std::string> mIgnore##mob##Set; |