diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-09-17 11:00:58 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-09-17 11:00:58 +0200 |
| commit | 4af16d1b24bd6bc8f6cde6b926525c0f9756ccd5 (patch) | |
| tree | 7099d717e2230723306c570953a41f625de58236 /src | |
| parent | bbc983fc3d3a525187bdcf08ea6e10e8e31e1b0b (diff) | |
Core/DataStores: Fixed loading hotfix locales when default locale set in worldserver.conf is not enUS
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/DataStores/DB2Stores.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp index b00d0ad6aa3..675320317da 100644 --- a/src/server/game/DataStores/DB2Stores.cpp +++ b/src/server/game/DataStores/DB2Stores.cpp @@ -250,6 +250,10 @@ inline void LoadDB2(uint32& availableDb2Locales, DB2StoreProblemList& errlist, D if (storage->Load(db2Path + localeNames[defaultLocale] + '/', defaultLocale)) { storage->LoadFromDB(); + // LoadFromDB() always loads strings into enUS locale, other locales are expected to have data in corresponding _locale tables + // so we need to make additional call to load that data in case said locale is set as default by worldserver.conf (and we do not want to load all this data from .db2 file again) + if (defaultLocale != LOCALE_enUS) + storage->LoadStringsFromDB(defaultLocale); for (uint32 i = 0; i < TOTAL_LOCALES; ++i) { |