summaryrefslogtreecommitdiff
path: root/src/game-server/monstermanager.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2011-10-19 22:56:32 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2011-10-20 23:10:40 +0200
commit4e49081ca1f0d658308582ef3084837bb58c33ec (patch)
tree85ab83e760a3bd017a1ef1ab2054eef049aa0f8e /src/game-server/monstermanager.cpp
parent03ff7c110e536de1f8b239817e50cb07c492da6f (diff)
downloadmanaserv-4e49081ca1f0d658308582ef3084837bb58c33ec.tar.gz
manaserv-4e49081ca1f0d658308582ef3084837bb58c33ec.tar.bz2
manaserv-4e49081ca1f0d658308582ef3084837bb58c33ec.tar.xz
manaserv-4e49081ca1f0d658308582ef3084837bb58c33ec.zip
Return a const & from NameMap to avoid potential deep copies
When I introduced NameMap it was only used with pointers, but now it is also used with std::string so it probably makes sense to keep a default- constructed value around so that a reference can be returned rather than a copy. NameMap::find was renamed to NameMap::value to make it more clear that it doesn't return an iterator, like std::map::find. Reviewed-by: Yohann Ferreira Reviewed-by: Ben Longbons
Diffstat (limited to 'src/game-server/monstermanager.cpp')
-rw-r--r--src/game-server/monstermanager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game-server/monstermanager.cpp b/src/game-server/monstermanager.cpp
index b7efd003..0f1686ca 100644
--- a/src/game-server/monstermanager.cpp
+++ b/src/game-server/monstermanager.cpp
@@ -350,7 +350,7 @@ void MonsterManager::deinitialize()
MonsterClass *MonsterManager::getMonsterByName(const std::string &name) const
{
- return mMonsterClassesByName.find(name);
+ return mMonsterClassesByName.value(name);
}
MonsterClass *MonsterManager::getMonster(int id) const