Once more get the localized name of items in AH searches (#226)

lh-server · Oct 31, 2018 · a63adb7 · a63adb7
1 parent 3d7cccc
commit a63adb7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/src/game/AuctionHouse/AuctionHouseMgr.cpp b/src/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -797,8 +797,7 @@ void AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player
                 if (propertyId > 0)
                      randomProperty = sItemRandomPropertiesStore.LookupEntry(static_cast<uint32>(propertyId));
 
-                if (randomProperty)
-                    Item::GetNameWithSuffix(name, proto, randomProperty, loc_idx, dbc_loc);
+                Item::GetLocalizedNameWithSuffix(name, proto, randomProperty, loc_idx, dbc_loc);
 
                 if (!Utf8FitTo(name, query.wsearchedname))
                     continue;

diff --git a/src/game/Chat/Chat.cpp b/src/game/Chat/Chat.cpp
@@ -2134,7 +2134,7 @@ bool ChatHandler::isValidChatMessage(const char* message)
                                     // Compare the name. If the name isn't correct, maybe it's an enchantment
                                     // instead.
                                     std::string expectedName = linkedItem->Name1;
-                                    Item::GetNameWithSuffix(expectedName, linkedItem, iProp, dbLocale, dbcLocale);
+                                    Item::GetLocalizedNameWithSuffix(expectedName, linkedItem, iProp, dbLocale, dbcLocale);
                                     if (expectedName == buffer)
                                     {
                                         hasValidRandomProperty = true;
@@ -2162,7 +2162,7 @@ bool ChatHandler::isValidChatMessage(const char* message)
                         {
                             // Finally compare base name
                             std::string expectedName = linkedItem->Name1;
-                            Item::GetNameWithSuffix(expectedName, linkedItem, nullptr, dbLocale, dbcLocale);
+                            Item::GetLocalizedNameWithSuffix(expectedName, linkedItem, nullptr, dbLocale, dbcLocale);
                             if (expectedName != buffer)
                                 return false;
                         }

diff --git a/src/game/Objects/Item.cpp b/src/game/Objects/Item.cpp
@@ -1161,7 +1161,7 @@ bool Item::ChangeEntry(ItemPrototype const* pNewProto)
     return true;
 }
 
-void Item::GetNameWithSuffix(std::string& name, const ItemPrototype* proto, const ItemRandomPropertiesEntry* randomProp, int dbLocale, LocaleConstant dbcLocale)
+void Item::GetLocalizedNameWithSuffix(std::string& name, const ItemPrototype* proto, const ItemRandomPropertiesEntry* randomProp, int dbLocale, LocaleConstant dbcLocale)
 {
     // local name
     if (dbLocale >= 0)

diff --git a/src/game/Objects/Item.h b/src/game/Objects/Item.h
@@ -352,7 +352,7 @@ class MANGOS_DLL_SPEC Item : public Object
         bool HasGeneratedLootSecondary() {  return generatedLoot; } // todo, remove and add condition to HasGeneratedLoot
 
         bool IsCharter() const { return GetEntry() == 5863u; }
-        static void GetNameWithSuffix(std::string& name, const ItemPrototype* proto, const ItemRandomPropertiesEntry* randomProp, int dbLocale, LocaleConstant dbcLocale);
+        static void GetLocalizedNameWithSuffix(std::string& name, const ItemPrototype* proto, const ItemRandomPropertiesEntry* randomProp, int dbLocale, LocaleConstant dbcLocale);
 
     private:
         bool generatedLoot;