summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/itemdb.cpp6
-rw-r--r--src/resources/itemdb.h2
2 files changed, 3 insertions, 5 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())
{
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 2a76eecd..2bb8fd5e 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -56,8 +56,6 @@ namespace ItemDB
// Items database
typedef std::map<int, ItemInfo*> ItemInfos;
typedef std::map<std::string, ItemInfo*> NamedItemInfos;
- typedef ItemInfos::iterator ItemInfoIterator;
- typedef NamedItemInfos::iterator NamedItemInfoIterator;
}
#endif