From f9f89664be882ae047e5cd30b9f8b1fb24d65f00 Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Thu, 5 Nov 2026 05:14:45 +0000 Subject: [PATCH] Decompile 3 functions in Source/Contents/CashEmotionMgr.cpp Batch #11886 by Yommy: 3 byte-identical, 0 confirmed by peer review. - fn_02950 CCashEmotionMgr::GetEarliestExpiry: byte-identical - fn_09340 UICashEmotionListChildWnd_Abstract::UICashEmotionListChildWnd_Abstract: byte-identical (already on main) - fn_09411 UICashEmotionListWnd::RefreshCurrentList: byte-identical Merged automatically: every function is byte-identical to the original. --- Source/Contents/CashEmotionMgr.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Source/Contents/CashEmotionMgr.cpp b/Source/Contents/CashEmotionMgr.cpp index 6f790634..4b422c22 100644 --- a/Source/Contents/CashEmotionMgr.cpp +++ b/Source/Contents/CashEmotionMgr.cpp @@ -178,7 +178,7 @@ protected: class UICashEmotionScrollWnd : public UIScrollWnd { public: - UICashEmotionScrollWnd(int width, int height, unsigned char cached); + __declspec(noinline) UICashEmotionScrollWnd(int width, int height, unsigned char cached); void Slot15(int width, int height) override; void Slot53() override; @@ -188,7 +188,7 @@ public: class UICashEmotionListChildWnd_Abstract : public UICashEmotionScrollWnd { public: - UICashEmotionListChildWnd_Abstract(int width, int height, unsigned char cached); + __declspec(noinline) UICashEmotionListChildWnd_Abstract(int width, int height, unsigned char cached); void Slot35(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; @@ -804,9 +804,7 @@ std::vector CCashEmotionMgr::GetPackEmotions(int packId) { int CCashEmotionMgr::GetEarliestExpiry() { int earliest = INT_MAX; for (const auto& expiry : this->m_expiry) { - if (expiry.second.seconds < earliest) { - earliest = expiry.second.seconds; - } + earliest = std::min(earliest, expiry.second.seconds); } return earliest; @@ -2297,7 +2295,7 @@ void UICashEmotionListWnd::Slot19() { // FUNCTION: fn_09411 void UICashEmotionListWnd::RefreshCurrentList() { if (this->m_currentList) { - this->m_currentList->Refresh(this->m_searchEdit ? this->m_searchEdit->Text() : nullptr); + this->m_currentList->Refresh(!this->m_searchEdit ? nullptr : this->m_searchEdit->Text()); } }