From 369aeb21117d66886ee199dca0fbccaaa776a127 Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Thu, 12 Nov 2026 08:25:50 +0000 Subject: [PATCH] Decompile 4 functions in Source/Contents/CashEmotion/CashEmotionMgr.cpp Batch #18064 by eAthena: 4 byte-identical, 0 confirmed by peer review. - fn_09445 UICashEmotionPack::OnCreate: byte-identical - fn_09457 UICashEmotionPack_Purchase::UICashEmotionPack_Purchase: byte-identical (already on main) - fn_09466 UICashEmotionPack_Search_Normal::`scalar deleting destructor': byte-identical (already on main) - fn_09469 UICashEmotionPack_Search_UnPurchased::`scalar deleting destructor': byte-identical (already on main) Merged automatically: every function is byte-identical to the original. --- .../Contents/CashEmotion/CashEmotionMgr.cpp | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/Source/Contents/CashEmotion/CashEmotionMgr.cpp b/Source/Contents/CashEmotion/CashEmotionMgr.cpp index 5ba62604e..b68321046 100644 --- a/Source/Contents/CashEmotion/CashEmotionMgr.cpp +++ b/Source/Contents/CashEmotion/CashEmotionMgr.cpp @@ -99,6 +99,9 @@ protected: class CCashEmotionAction_Register : public ICashEmotionAction { public: + // INLINED + CCashEmotionAction_Register() { + } bool Execute(int packId, int emotionId) override; }; @@ -128,6 +131,9 @@ public: // INLINED explicit UICashEmotionPack_Search() : UICashEmotionPack() { } + // INLINED + ~UICashEmotionPack_Search() override { + } void Paint() override; int SetResults(const char* title, const std::vector>& results); @@ -186,6 +192,9 @@ protected: class UICashEmotionScrollWnd : public UIScrollWnd { public: __declspec(noinline) UICashEmotionScrollWnd(int width, int height, unsigned char cached); + // INLINED + ~UICashEmotionScrollWnd() override { + } void OnCreate(int width, int height) override; void UpdateScrollRange() override; @@ -196,6 +205,9 @@ public: class UICashEmotionListChildWnd_Abstract : public UICashEmotionScrollWnd { public: __declspec(noinline) UICashEmotionListChildWnd_Abstract(int width, int height, unsigned char cached); + // INLINED + ~UICashEmotionListChildWnd_Abstract() override { + } void OnWheel(int delta) override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; virtual void Refresh(const char* filter) = 0; @@ -3067,13 +3079,12 @@ int UICashEmotionPack::SetPack(int packId, bool showTooltip, bool hoverable) { // OFFSET: 0x007CA550 // FUNCTION: fn_09445 void UICashEmotionPack::OnCreate(int, int) { - auto* priceText = new (std::nothrow) UIStaticText(); - this->packTitleText = priceText; - if (priceText) { - priceText->SetSize(145, 14); - priceText->Move(33, 14); - priceText->shadow = 1; - this->AddChild(priceText); + this->packTitleText = new (std::nothrow) UIStaticText(); + if (this->packTitleText) { + this->packTitleText->SetSize(145, 14); + this->packTitleText->Move(33, 14); + this->packTitleText->shadow = 1; + this->AddChild(this->packTitleText); } this->m_titleText = new UIStaticText();