diff --git a/Source/Contents/Items/ItemInfo.h b/Source/Contents/Items/ItemInfo.h index e4f9bf0a1..3cf40d081 100644 --- a/Source/Contents/Items/ItemInfo.h +++ b/Source/Contents/Items/ItemInfo.h @@ -91,6 +91,7 @@ struct alignas(8) ITEM_INFO { bool IsAboveItemId600() const; int Refine(char* output, int& capacity, unsigned char consume) const; int GetIdDisplayName(char* output, int& capacity, unsigned char consume) const; + int UnidentifiedName(char* output, int& capacity, unsigned char consume) const; const std::vector& Description() const; std::vector Serialize() const; std::uint32_t Deserialize(const std::vector& data); diff --git a/Source/Contents/Items/ItemNaming.cpp b/Source/Contents/Items/ItemNaming.cpp index 3469a5487..29feafe19 100644 --- a/Source/Contents/Items/ItemNaming.cpp +++ b/Source/Contents/Items/ItemNaming.cpp @@ -363,7 +363,7 @@ std::string ITEM_INFO::DisplayName(unsigned char detailed) const { } } } else { - AppendText(result, text, ItemUnidentifiedName(*this, text, capacity, 0)); + AppendText(result, text, this->UnidentifiedName(text, capacity, 0)); } return result; @@ -465,8 +465,9 @@ int ItemSlotsCount(const ITEM_INFO& item) { // OFFSET: 0x006D7760 // FUNCTION: fn_06594 -int ItemUnidentifiedName(const ITEM_INFO& item, char* output, int& capacity, unsigned char consume) { - const char* name = FindItemDescription(std::atoi(item.itemId.c_str())).unidentifiedName; +int ITEM_INFO::UnidentifiedName(char* output, int& capacity, unsigned char consume) const { + const int id = std::atoi(this->itemId.c_str()); + const char* name = FindItemDescription(id, g_itemDescriptions).unidentifiedName; return CopyText(output, capacity, consume, name ? name : " "); } diff --git a/Source/Contents/Items/ItemNaming.h b/Source/Contents/Items/ItemNaming.h index d8dbc5131..692eab92d 100644 --- a/Source/Contents/Items/ItemNaming.h +++ b/Source/Contents/Items/ItemNaming.h @@ -41,7 +41,6 @@ std::uint32_t __fastcall ItemCardColor(const ITEM_INFO* item); std::string ItemDisplayName(int id); const char* ItemResourcePath(const ITEM_INFO& item); int ItemSlotsCount(const ITEM_INFO& item); -int ItemUnidentifiedName(const ITEM_INFO& item, char* output, int& capacity, unsigned char consume); #if defined(_WIN32) && !defined(_WIN64) static_assert(sizeof(ItemCardName) == 12); diff --git a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp index ec1b0bd3a..1f58cddbe 100644 --- a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp +++ b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp @@ -11813,7 +11813,7 @@ int UIFrameWnd::BuildItemName( } } } else { - *cursor += ItemUnidentifiedName(*item, *cursor, capacity, 1); + *cursor += item->UnidentifiedName(*cursor, capacity, 1); breaks->push_back(*cursor); } return 1;