aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSpp <none@none>2010-05-16 00:58:24 +0200
committerSpp <none@none>2010-05-16 00:58:24 +0200
commita99c6bd5a9c26126b59979fb21abb1c847a6edf8 (patch)
tree753d1f4fd3ffb8eb5850c86227850966e96b95da /src
parentfa57ce4cd12082e92f4da59c93b2f711f7e36ecd (diff)
Fix localization of gossip menu options
Original patch by Qowyn Adapted to trinity (and tested) by Durotar and Aokromes --HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/ObjectMgr.cpp6
-rw-r--r--src/game/ObjectMgr.h2
-rw-r--r--src/game/World.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 44515128c9b..79438739ce4 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -380,7 +380,7 @@ void ObjectMgr::LoadCreatureLocales()
sLog.outString(">> Loaded %lu creature locale strings", (unsigned long)mCreatureLocaleMap.size());
}
-void ObjectMgr::LoadNpcOptionLocales()
+void ObjectMgr::LoadGossipMenuItemsLocales()
{
mGossipMenuItemsLocaleMap.clear(); // need for reload case
@@ -408,7 +408,7 @@ void ObjectMgr::LoadNpcOptionLocales()
for (uint8 i = 1; i < MAX_LOCALE; ++i)
{
- std::string str = fields[1+2*(i-1)].GetCppString();
+ std::string str = fields[2+2*(i-1)].GetCppString();
if (!str.empty())
{
int idx = GetOrNewIndexForLocale(LocaleConstant(i));
@@ -420,7 +420,7 @@ void ObjectMgr::LoadNpcOptionLocales()
data.OptionText[idx] = str;
}
}
- str = fields[1+2*(i-1)+1].GetCppString();
+ str = fields[2+2*(i-1)+1].GetCppString();
if (!str.empty())
{
int idx = GetOrNewIndexForLocale(LocaleConstant(i));
diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h
index 2bdd4818db1..5abe59453a8 100644
--- a/src/game/ObjectMgr.h
+++ b/src/game/ObjectMgr.h
@@ -652,7 +652,7 @@ class ObjectMgr
void LoadQuestLocales();
void LoadNpcTextLocales();
void LoadPageTextLocales();
- void LoadNpcOptionLocales();
+ void LoadGossipMenuItemsLocales();
void LoadPointOfInterestLocales();
void LoadInstanceTemplate();
void LoadMailLevelRewards();
diff --git a/src/game/World.cpp b/src/game/World.cpp
index 833687c74b1..a66cacbefed 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -1311,7 +1311,7 @@ void World::SetInitialWorldSettings()
objmgr.LoadQuestLocales();
objmgr.LoadNpcTextLocales();
objmgr.LoadPageTextLocales();
- objmgr.LoadNpcOptionLocales();
+ objmgr.LoadGossipMenuItemsLocales();
objmgr.LoadPointOfInterestLocales();
objmgr.SetDBCLocaleIndex(GetDefaultDbcLocale()); // Get once for all the locale index of DBC language (console/broadcasts)
sLog.outString(">>> Localization strings loaded");