From 75d7a4c0cb9cf2d56efb491ef80ba2747f30dc56 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Mon, 18 May 2009 12:20:51 +0400 Subject: [PATCH] [7844] Fixed mangos string storage index type. --- src/game/ObjectMgr.cpp | 6 +----- src/game/ObjectMgr.h | 2 +- src/shared/revision_nr.h | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 5cb337b3e..f6518193f 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -6553,11 +6553,7 @@ bool ObjectMgr::LoadMangosStrings(DatabaseType& db, char const* table, int32 min for(MangosStringLocaleMap::iterator itr = mMangosStringLocaleMap.begin(); itr != mMangosStringLocaleMap.end();) { if (itr->first >= start_value && itr->first < end_value) - { - MangosStringLocaleMap::iterator itr2 = itr; - ++itr; - mMangosStringLocaleMap.erase(itr2); - } + mMangosStringLocaleMap.erase(itr++); else ++itr; } diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h index d2cb1a766..0a056afef 100644 --- a/src/game/ObjectMgr.h +++ b/src/game/ObjectMgr.h @@ -156,7 +156,7 @@ typedef UNORDERED_MAP ItemLocaleMap; typedef UNORDERED_MAP QuestLocaleMap; typedef UNORDERED_MAP NpcTextLocaleMap; typedef UNORDERED_MAP PageTextLocaleMap; -typedef UNORDERED_MAP MangosStringLocaleMap; +typedef UNORDERED_MAP MangosStringLocaleMap; typedef UNORDERED_MAP NpcOptionLocaleMap; typedef UNORDERED_MAP PointOfInterestLocaleMap; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 4136ee5bd..f60172600 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7843" + #define REVISION_NR "7844" #endif // __REVISION_NR_H__