From 9987352c0faa9fcaf0d93367bea950dac36a24a1 Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Wed, 11 Nov 2026 08:08:10 +0000 Subject: [PATCH] Confirm fn_12079 (UIFrameWnd::AddNumberedButton) Batch #16752 by eAthena: 0 byte-identical, 1 confirmed by peer review. - fn_12079 UIFrameWnd::AddNumberedButton: logic confirmed by peer review (already on main) Accepted without human review: peers confirmed the logic ("same" ahead by at least 3, with 70% of the votes). --- Source/Contents/Emblems/EmblemCache.cpp | 2 ++ Source/UI/Acceptance/UIExchangeAcceptWnd.cpp | 2 ++ Source/UI/GameSettings/UIHotkeyGuideWnd.cpp | 3 +++ Source/UI/Gauges/UIBarGraph.cpp | 2 ++ Source/UI/Items/UIItemStoreComboBox.cpp | 2 ++ Source/UI/Lists/UIComboBoxDefWnd.cpp | 8 ++++---- Source/UI/Quest/UIRecommendedQuestInfo.cpp | 2 ++ Source/UI/Quest/UIRenewQuestWnd.cpp | 2 ++ Source/UI/Status/UIBasicInfoWnd.cpp | 2 ++ Source/UI/Text/UITextViewer.cpp | 2 ++ Source/UI/Window/UIFrameWnd.cpp | 2 ++ 11 files changed, 25 insertions(+), 4 deletions(-) diff --git a/Source/Contents/Emblems/EmblemCache.cpp b/Source/Contents/Emblems/EmblemCache.cpp index 4dabeb1d5..8b5e35fb7 100644 --- a/Source/Contents/Emblems/EmblemCache.cpp +++ b/Source/Contents/Emblems/EmblemCache.cpp @@ -21,6 +21,8 @@ #include #include +extern template std::string::basic_string(std::_String_constructor_concat_tag, const std::string&, const char*, std::size_t, const char*, std::size_t); + namespace { // INLINED __forceinline std::string Basename(const std::string& path) { diff --git a/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp b/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp index 63a245905..8c00bc7ab 100644 --- a/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp +++ b/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp @@ -24,6 +24,8 @@ #include #include +extern template std::string::basic_string(std::_String_constructor_concat_tag, const std::string&, const char*, std::size_t, const char*, std::size_t); + namespace { #pragma pack(push, 1) struct ExchangeRecordHeader { diff --git a/Source/UI/GameSettings/UIHotkeyGuideWnd.cpp b/Source/UI/GameSettings/UIHotkeyGuideWnd.cpp index 3abb9dc03..750e6d5a4 100644 --- a/Source/UI/GameSettings/UIHotkeyGuideWnd.cpp +++ b/Source/UI/GameSettings/UIHotkeyGuideWnd.cpp @@ -19,6 +19,9 @@ #include "Utility/Text/FormatString.h" #include "Resource/MSGSTRINGID.h" + +extern template std::string::basic_string(std::_String_constructor_concat_tag, const std::string&, const char*, std::size_t, const char*, std::size_t); + // OFFSET: 0x009663D0 // FUNCTION: fn_13154 UIHotkeyGuideWnd::UIHotkeyGuideWnd() diff --git a/Source/UI/Gauges/UIBarGraph.cpp b/Source/UI/Gauges/UIBarGraph.cpp index 670843985..f265a96b0 100644 --- a/Source/UI/Gauges/UIBarGraph.cpp +++ b/Source/UI/Gauges/UIBarGraph.cpp @@ -9,6 +9,8 @@ #include #include +extern template std::string::basic_string(std::_String_constructor_concat_tag, const std::string&, const char*, std::size_t, const char*, std::size_t); + // OFFSET: 0x0086C190 // FUNCTION: fn_11022 UIBarGraph2::UIBarGraph2() : UIBarGraph() { diff --git a/Source/UI/Items/UIItemStoreComboBox.cpp b/Source/UI/Items/UIItemStoreComboBox.cpp index edae3aa40..777e931a1 100644 --- a/Source/UI/Items/UIItemStoreComboBox.cpp +++ b/Source/UI/Items/UIItemStoreComboBox.cpp @@ -6,6 +6,8 @@ #include #include +extern template std::string::basic_string(std::_String_constructor_concat_tag, const std::string&, const char*, std::size_t, const char*, std::size_t); + // OFFSET: 0x0086D530 // FUNCTION: fn_11047 UIItemStoreComboBox::UIItemStoreComboBox() diff --git a/Source/UI/Lists/UIComboBoxDefWnd.cpp b/Source/UI/Lists/UIComboBoxDefWnd.cpp index abbedb30a..47b67c78c 100644 --- a/Source/UI/Lists/UIComboBoxDefWnd.cpp +++ b/Source/UI/Lists/UIComboBoxDefWnd.cpp @@ -32,6 +32,9 @@ #include "UI/Login/UINewSelectCharWnd.h" #include "Resource/MSGSTRINGID.h" #include + +extern template std::string::basic_string(std::_String_constructor_concat_tag, const std::string&, const char*, std::size_t, const char*, std::size_t); + namespace { constexpr char prefix[] = "유저인터페이스\\"; } @@ -266,10 +269,7 @@ UIComboBoxDef2Wnd::~UIComboBoxDef2Wnd() = default; // OFFSET: 0x00885250 // FUNCTION: fn_11318 void UIComboBoxDef2Wnd::OnCreate(int width, int) { - std::string path = "유저인터페이스\\UIadventurerAgency\\"; - if (this->skin == 1) { - path = "유저인터페이스\\login_interface\\"; - } + std::string path = this->skin == 1 ? "유저인터페이스\\login_interface\\" : "유저인터페이스\\UIadventurerAgency\\"; this->button = new UIBitmapButton(); this->button->SetBitmap((path + "btn_dropdown_out" + ".bmp").c_str(), 0, 0); this->button->SetBitmap((path + "btn_dropdown_over" + ".bmp").c_str(), 1, 0); diff --git a/Source/UI/Quest/UIRecommendedQuestInfo.cpp b/Source/UI/Quest/UIRecommendedQuestInfo.cpp index 3f12ff042..c97bb1409 100644 --- a/Source/UI/Quest/UIRecommendedQuestInfo.cpp +++ b/Source/UI/Quest/UIRecommendedQuestInfo.cpp @@ -14,6 +14,8 @@ #include #include +extern template std::string::basic_string(std::_String_constructor_concat_tag, const std::string&, const char*, std::size_t, const char*, std::size_t); + // OFFSET: 0x00A568E0 // FUNCTION: fn_16321 void CUIRecommendedQuestInfo::Initialize() { diff --git a/Source/UI/Quest/UIRenewQuestWnd.cpp b/Source/UI/Quest/UIRenewQuestWnd.cpp index 18b43eb30..fe087955d 100644 --- a/Source/UI/Quest/UIRenewQuestWnd.cpp +++ b/Source/UI/Quest/UIRenewQuestWnd.cpp @@ -43,6 +43,8 @@ #include extern template std::string::basic_string(std::_String_constructor_concat_tag, const std::string&, const char*, std::size_t, const char*, std::size_t); +extern template std::_Tree_unchecked_const_iterator>>, std::_Iterator_base0>& +std::_Tree_unchecked_const_iterator>>, std::_Iterator_base0>::operator++() noexcept; #pragma pack(push, 1) struct PACKET_CZ_ACTIVE_QUEST { diff --git a/Source/UI/Status/UIBasicInfoWnd.cpp b/Source/UI/Status/UIBasicInfoWnd.cpp index 7cb7c43c1..db34c4ece 100644 --- a/Source/UI/Status/UIBasicInfoWnd.cpp +++ b/Source/UI/Status/UIBasicInfoWnd.cpp @@ -33,6 +33,8 @@ #include #include +extern template std::string::basic_string(std::_String_constructor_concat_tag, const std::string&, const char*, std::size_t, const char*, std::size_t); + namespace { std::int64_t BaseExpCurrent() { diff --git a/Source/UI/Text/UITextViewer.cpp b/Source/UI/Text/UITextViewer.cpp index 34a1826c0..09b542c84 100644 --- a/Source/UI/Text/UITextViewer.cpp +++ b/Source/UI/Text/UITextViewer.cpp @@ -21,6 +21,8 @@ #include #include +extern template std::string::basic_string(std::_String_constructor_concat_tag, const std::string&, const char*, std::size_t, const char*, std::size_t); + // OFFSET: 0x0086F0A0 // FUNCTION: fn_11086 UITextViewer::UITextViewer() : UIListBox(), splitTipLinks(0), outline(0), bold(0) { diff --git a/Source/UI/Window/UIFrameWnd.cpp b/Source/UI/Window/UIFrameWnd.cpp index 7ac18923d..7a45c4949 100644 --- a/Source/UI/Window/UIFrameWnd.cpp +++ b/Source/UI/Window/UIFrameWnd.cpp @@ -61,6 +61,8 @@ #include #include +extern template std::string::basic_string(std::_String_constructor_concat_tag, const std::string&, const char*, std::size_t, const char*, std::size_t); + // GLOBAL: gl_24747 std::uint32_t g_monsterInfoActorId;