diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
| commit | 382067b05c4fe97bcf0da0143405375ec295f7c6 (patch) | |
| tree | f668cd2595ac0c85f0942f88729d3ff1956676fa /src/actormanager.h | |
| parent | ee8191705826d978b7793497fdd307536c709bff (diff) | |
| parent | 9b329556e748050c4300174e9bdc72b15e5b8cc5 (diff) | |
| download | plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.gz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.bz2 plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.xz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/actormanager.h')
| -rw-r--r-- | src/actormanager.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/actormanager.h b/src/actormanager.h index 9ccd5eaa6..17bd696d6 100644 --- a/src/actormanager.h +++ b/src/actormanager.h @@ -296,8 +296,9 @@ class ActorManager final: public ConfigListener int getPickupItemIndex(const std::string &name) const A_WARN_UNUSED; - int getIndexByName(const std::string &name, const std::map<std::string, - int> &map) const A_WARN_UNUSED; + static int getIndexByName(const std::string &name, + const std::map<std::string, int> &map) + A_WARN_UNUSED; bool checkForPickup(const FloorItem *const item) const A_WARN_UNUSED; |