From c61da86f28a22db36655a93af3365afb34528e46 Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Sat, 31 Oct 2026 11:42:21 +0000 Subject: [PATCH] Decompile fn_09521 (UICashShopWnd::`scalar deleting destructor') Batch #7779 by eAthena: 0 byte-identical, 1 confirmed by peer review. - fn_09521 UICashShopWnd::`scalar deleting destructor': logic confirmed by peer review Peer-reviewed-by: ragnarok-clanker, secret, Snow Accepted without human review: peers confirmed the logic ("same" ahead by at least 3, with 70% of the votes). --- Source/UI/CashShop/UICashShopWnd.cpp | 19 +++++++++++++++++++ Source/UI/CashShop/UICashShopWnd.h | 10 +++------- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/Source/UI/CashShop/UICashShopWnd.cpp b/Source/UI/CashShop/UICashShopWnd.cpp index 790f5b56..697ab5f5 100644 --- a/Source/UI/CashShop/UICashShopWnd.cpp +++ b/Source/UI/CashShop/UICashShopWnd.cpp @@ -114,6 +114,25 @@ UICashShopWnd::UICashShopWnd(UIWindowContext& windows, UIFrameContext& frames) m_pageCount(0), unknown_00E0(nullptr), unknown_00E8(0), unknown_00EC(0), unknown_00F0(0), unknown_00F4(nullptr), m_cart(nullptr) { } +// OFFSET: 0x007CD750 +UICashShopWnd_Banner::UICashShopWnd_Banner(UIWindowContext& windows, UIButtonContext& controls) + : UIWindow(windows, 0), m_index(0), m_lastTick(timeGetTime()), m_controls(&controls) { +} + +// OFFSET: 0x007CD800 +UICashShopWnd_Cart::UICashShopWnd_Cart(UIWindowContext& windows, UIButtonContext& controls) + : UIWindow(windows, 0), m_scrollBar(nullptr), m_visibleCount(6), m_scrollIndex(0), m_controls(&controls) { +} + +// OFFSET: 0x007CD8C0 +UICashShopWnd_CartItem::UICashShopWnd_CartItem(UIWindowContext& windows, UIButtonContext& controls) : UIWindow(windows, 0), m_controls(&controls) { +} + +// OFFSET: 0x007CDE30 +// FUNCTION: fn_09521 +UICashShopWnd::~UICashShopWnd() { +} + // OFFSET: 0x007CE110 // FUNCTION: fn_09523 EncryptedName<85, 0x3B915119EFD523EFULL>& CashShopReplaceCartItemText::operator()() const { diff --git a/Source/UI/CashShop/UICashShopWnd.h b/Source/UI/CashShop/UICashShopWnd.h index 525b7e9c..8590d936 100644 --- a/Source/UI/CashShop/UICashShopWnd.h +++ b/Source/UI/CashShop/UICashShopWnd.h @@ -44,9 +44,7 @@ public: class UICashShopWnd_CartItem : public UIWindow { public: - // INLINED - UICashShopWnd_CartItem(UIWindowContext& windows, UIButtonContext& controls) : UIWindow(windows, 0), m_controls(&controls) { - } + UICashShopWnd_CartItem(UIWindowContext& windows, UIButtonContext& controls); void Slot10(int x, int y, std::intptr_t value) override; void Slot15(int width, int height) override; @@ -64,10 +62,7 @@ public: class UICashShopWnd_Cart : public UIWindow { public: - // INLINED - UICashShopWnd_Cart(UIWindowContext& windows, UIButtonContext& controls) - : UIWindow(windows, 0), m_scrollBar(nullptr), m_visibleCount(6), m_scrollIndex(0), m_controls(&controls) { - } + UICashShopWnd_Cart(UIWindowContext& windows, UIButtonContext& controls); void Slot10(int x, int y, std::intptr_t value) override; void Slot15(int width, int height) override; @@ -108,6 +103,7 @@ public: class UICashShopWnd : public UIFrameWnd { public: UICashShopWnd(UIWindowContext& windows, UIFrameContext& frames); + ~UICashShopWnd() override; bool Slot03() override; void Slot10(int x, int y, std::intptr_t value) override; void Slot15(int width, int height) override;