diff options
author | Shauren <shauren.trinity@gmail.com> | 2015-02-22 17:18:19 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2015-02-22 17:18:19 +0100 |
commit | e81eb1192a159627d06946a8ed84174e8ead7299 (patch) | |
tree | 8ed00f4449165929532fbb6e9592bb5f76927b8c /src/server/game/Chat/ChatLink.cpp | |
parent | 850b8ea8ed21d843d6addc70e1bf2deb0eb08832 (diff) |
Core/Database: Removed locales_item from world database (use item_sparse_locale in hotfixes database)
Diffstat (limited to 'src/server/game/Chat/ChatLink.cpp')
-rw-r--r-- | src/server/game/Chat/ChatLink.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/server/game/Chat/ChatLink.cpp b/src/server/game/Chat/ChatLink.cpp index 640127b235b..ea12ff91a1d 100644 --- a/src/server/game/Chat/ChatLink.cpp +++ b/src/server/game/Chat/ChatLink.cpp @@ -167,7 +167,7 @@ bool ItemChatLink::Initialize(std::istringstream& iss) return true; } -inline std::string ItemChatLink::FormatName(uint8 index, ItemLocale const* /*locale*/, char* suffixStrings) const +inline std::string ItemChatLink::FormatName(uint8 index, char* suffixStrings) const { std::stringstream ss; ss << _item->GetName(LocaleConstant(index)); @@ -183,13 +183,12 @@ bool ItemChatLink::ValidateName(char* buffer, const char* context) char* suffixStrings = _suffix ? _suffix->Name_lang : (_property ? _property->Name_lang : NULL); - bool res = (FormatName(LOCALE_enUS, NULL, suffixStrings) == buffer); + bool res = (FormatName(LOCALE_enUS, suffixStrings) == buffer); if (!res) { - ItemLocale const* il = sObjectMgr->GetItemLocale(_item->GetId()); for (uint8 index = LOCALE_koKR; index < TOTAL_LOCALES; ++index) { - if (FormatName(index, il, suffixStrings) == buffer) + if (FormatName(index, suffixStrings) == buffer) { res = true; break; |