aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormegamage <none@none>2009-05-18 15:07:14 -0500
committermegamage <none@none>2009-05-18 15:07:14 -0500
commitbd87c96f4cf9c3f312f63a1815df47e1ad5a1cc8 (patch)
tree2ba8c6faca439d56d50a0e9dd69864445b21b7f4
parente8be2f026e59acb2a1629e4300c07cfbc9d2af89 (diff)
[7844] Fixed mangos string storage index type. Author: VladimirMangos
--HG-- branch : trunk
-rw-r--r--src/game/ObjectMgr.cpp6
-rw-r--r--src/game/ObjectMgr.h2
2 files changed, 2 insertions, 6 deletions
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 3ed60018ecc..02da82cb5fb 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -6851,11 +6851,7 @@ bool ObjectMgr::LoadTrinityStrings(DatabaseType& db, char const* table, int32 mi
for(TrinityStringLocaleMap::iterator itr = mTrinityStringLocaleMap.begin(); itr != mTrinityStringLocaleMap.end();)
{
if (itr->first >= start_value && itr->first < end_value)
- {
- TrinityStringLocaleMap::iterator itr2 = itr;
- ++itr;
- mTrinityStringLocaleMap.erase(itr2);
- }
+ mTrinityStringLocaleMap.erase(itr++);
else
++itr;
}
diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h
index 33915398c91..136429a41d5 100644
--- a/src/game/ObjectMgr.h
+++ b/src/game/ObjectMgr.h
@@ -154,7 +154,7 @@ typedef UNORDERED_MAP<uint32,ItemLocale> ItemLocaleMap;
typedef UNORDERED_MAP<uint32,QuestLocale> QuestLocaleMap;
typedef UNORDERED_MAP<uint32,NpcTextLocale> NpcTextLocaleMap;
typedef UNORDERED_MAP<uint32,PageTextLocale> PageTextLocaleMap;
-typedef UNORDERED_MAP<uint32,TrinityStringLocale> TrinityStringLocaleMap;
+typedef UNORDERED_MAP<int32,TrinityStringLocale> TrinityStringLocaleMap;
typedef UNORDERED_MAP<uint32,NpcOptionLocale> NpcOptionLocaleMap;
typedef UNORDERED_MAP<uint32,PointOfInterestLocale> PointOfInterestLocaleMap;