diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-01-13 15:02:23 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-01-13 15:02:23 +0100 |
| commit | 5f54ef36e27e13dd37e232eca74fd196f31e7807 (patch) | |
| tree | d1595e4e29f8b60781a88543dc83fe8084e37161 /src/resources | |
| parent | f53a1cf0ff67b5bc11de5e28bb2d76070b019e0f (diff) | |
| download | mana-5f54ef36e27e13dd37e232eca74fd196f31e7807.tar.gz mana-5f54ef36e27e13dd37e232eca74fd196f31e7807.tar.bz2 mana-5f54ef36e27e13dd37e232eca74fd196f31e7807.tar.xz mana-5f54ef36e27e13dd37e232eca74fd196f31e7807.zip | |
Moved the normalize() function in strungUtils where it belongs.
(Preparation for bringing a smaller item loading refactoring patch.)
Trivial.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/itemdb.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index b167e956..019c66e3 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -75,12 +75,6 @@ static ItemType itemTypeFromString(const std::string &name, int id = 0) else return ITEM_UNUSABLE; } -static std::string normalized(const std::string &name) -{ - std::string normalized = name; - return toLower(trim(normalized));; -} - void ItemDB::load() { if (mLoaded) @@ -275,7 +269,7 @@ void ItemDB::load() mItemInfos[id] = itemInfo; if (!name.empty()) { - std::string temp = normalized(name); + std::string temp = normalize(name); NamedItemInfos::const_iterator itr = mNamedItemInfos.find(temp); if (itr == mNamedItemInfos.end()) @@ -354,7 +348,7 @@ const ItemInfo &ItemDB::get(const std::string &name) { assert(mLoaded); - NamedItemInfos::const_iterator i = mNamedItemInfos.find(normalized(name)); + NamedItemInfos::const_iterator i = mNamedItemInfos.find(normalize(name)); if (i == mNamedItemInfos.end()) { |