summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-05-29 19:55:07 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-05-29 20:49:40 +0200
commit8a95ed77fec7c2ef3c0fac81258f70db25009b48 (patch)
treed6b6cb5fbe337ac998ed8af461027064970027af
parent7d01ae57c61c604ed6078bb3910283d9a8a6ffc7 (diff)
downloadmanaserv-8a95ed77fec7c2ef3c0fac81258f70db25009b48.tar.gz
manaserv-8a95ed77fec7c2ef3c0fac81258f70db25009b48.tar.xz
manaserv-8a95ed77fec7c2ef3c0fac81258f70db25009b48.zip
Use const std::string & to avoid a copy
-rw-r--r--src/game-server/skillmanager.cpp9
-rw-r--r--src/game-server/skillmanager.hpp2
2 files changed, 5 insertions, 6 deletions
diff --git a/src/game-server/skillmanager.cpp b/src/game-server/skillmanager.cpp
index ccf1592..4d262a4 100644
--- a/src/game-server/skillmanager.cpp
+++ b/src/game-server/skillmanager.cpp
@@ -102,17 +102,16 @@ void SkillManager::reload()
}
}
-int SkillManager::getIdFromString(std::string name)
+int SkillManager::getIdFromString(const std::string &name)
{
//check if already an integer, if yes just return it
int val;
val = atoi(name.c_str());
- if (val) return val;
+ if (val)
+ return val;
// convert to upper case for easier finding
- name = utils::toupper(name);
- // find it
- SkillMap::iterator i = skillMap.find(name);
+ SkillMap::iterator i = skillMap.find(utils::toupper(name));
if (i == skillMap.end())
{
return 0;
diff --git a/src/game-server/skillmanager.hpp b/src/game-server/skillmanager.hpp
index 6c8b2c0..c6a73a5 100644
--- a/src/game-server/skillmanager.hpp
+++ b/src/game-server/skillmanager.hpp
@@ -40,7 +40,7 @@ namespace SkillManager
* Gets the skill ID of a skill string
* (not case-sensitive to reduce wall-bashing)
*/
- int getIdFromString(std::string name); // no, thorbjorn, I am not passing this as const reference. I need a local copy.
+ int getIdFromString(const std::string &name);
}