diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-16 22:57:39 +0200 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-16 22:57:39 +0200 |
| commit | 576972fb768b0e43d41bada49ad88c6431494f10 (patch) | |
| tree | 755420a6c566a748233c06310062ea2cdfa280da /src/resources/itemdb.cpp | |
| parent | c6b4edf8cc635ddcb2a8b3c0cef38dd88fa73768 (diff) | |
| parent | a0f7bc231d9c348ba86248dd8d0adfddbce453f7 (diff) | |
| download | mana-576972fb768b0e43d41bada49ad88c6431494f10.tar.gz mana-576972fb768b0e43d41bada49ad88c6431494f10.tar.bz2 mana-576972fb768b0e43d41bada49ad88c6431494f10.tar.xz mana-576972fb768b0e43d41bada49ad88c6431494f10.zip | |
Merge branch '0.0.29'
Diffstat (limited to 'src/resources/itemdb.cpp')
| -rw-r--r-- | src/resources/itemdb.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 36be4d0c..807fa0a4 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -200,7 +200,7 @@ void ItemDB::load() std::string temp = name; toLower(trim(temp)); - NamedItemInfoIterator itr = mNamedItemInfos.find(temp); + NamedItemInfos::const_iterator itr = mNamedItemInfos.find(temp); if (itr == mNamedItemInfos.end()) { mNamedItemInfos[temp] = itemInfo; @@ -248,7 +248,7 @@ const ItemInfo& ItemDB::get(int id) { assert(mLoaded); - ItemInfoIterator i = mItemInfos.find(id); + ItemInfos::const_iterator i = mItemInfos.find(id); if (i == mItemInfos.end()) { @@ -265,7 +265,7 @@ const ItemInfo& ItemDB::get(const std::string &name) { assert(mLoaded && !name.empty()); - NamedItemInfoIterator i = mNamedItemInfos.find(name); + NamedItemInfos::const_iterator i = mNamedItemInfos.find(name); if (i == mNamedItemInfos.end()) { |