From d0adcf0e3c8a1db5e06bbbb8ae950ea5ebeeb8eb Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 4 Jan 2015 15:50:56 +0300 Subject: Add stringmap typedefs. --- src/actormanager.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/actormanager.h') 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 &getAttackMobsMap() - const A_WARN_UNUSED + const StringIntMap &getAttackMobsMap() const A_WARN_UNUSED { return mAttackMobsMap; } - const std::map &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 &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 mPriority##mob;\ std::set mPriority##mob##Set;\ - std::map mPriority##mob##Map; + StringIntMap mPriority##mob##Map; #define defVars(mob) \ std::list m##mob;\ std::set m##mob##Set;\ - std::map m##mob##Map;\ + StringIntMap m##mob##Map;\ std::list mIgnore##mob;\ std::set mIgnore##mob##Set; -- cgit v1.2.3-70-g09d2