From 261b245803e8f5bbb0063c01f2abb6b2ef2ed7e1 Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Sat, 31 Oct 2026 12:46:46 +0000 Subject: [PATCH] Decompile 2 functions in Source/UI/Dialogs/UIEditctrlWnd.cpp, Source/UI/Dialogs/UIEditctrlWnd.h, ... Batch #7944 by eAthena: 0 byte-identical, 2 confirmed by peer review. - fn_13549 UIEditctrlWnd::UIEditctrlWnd: logic confirmed by peer review - fn_13550 UIMiniMapWnd::UIMiniMapWnd: logic confirmed by peer review Peer-reviewed-by: Yommy, secret, Romain, pedrao Accepted without human review: peers confirmed the logic ("same" ahead by at least 3, with 70% of the votes). --- Source/UI/Dialogs/UIEditctrlWnd.cpp | 16 ++++++++++++++++ Source/UI/Dialogs/UIEditctrlWnd.h | 1 + Source/UI/Dialogs/UIMiniMapWnd.h | 6 ++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Source/UI/Dialogs/UIEditctrlWnd.cpp b/Source/UI/Dialogs/UIEditctrlWnd.cpp index 3573d285..1ebaac44 100644 --- a/Source/UI/Dialogs/UIEditctrlWnd.cpp +++ b/Source/UI/Dialogs/UIEditctrlWnd.cpp @@ -38,6 +38,22 @@ const char* g_miniMapMemoPath = "%s\\Memo\\$$%s.txt"; // GLOBAL: gl_25072 const char* g_miniMapMemoLineFormat = "%d\t%d\t%s\r\n"; +// OFFSET: 0x0099B0C0 +// FUNCTION: fn_13549 +UIEditctrlWnd::UIEditctrlWnd(UIWindowContext& windows, UIFrameContext& frames, UIButtonContext& controls, UIEditContext& edit) + : UIFrameWnd(windows, frames, 0), m_controls(&controls), m_editContext(&edit) { +} + +// OFFSET: 0x0099B120 +// FUNCTION: fn_13550 +UIMiniMapWnd::UIMiniMapWnd(UIWindowContext& windows, UIFrameContext& frames, UIButtonContext& controls) + : UIFrameWnd(windows, frames, 0), m_controls(&controls) { + this->dragging = 0; + this->unknown_0114 = 0; + this->unknown_011C = nullptr; + this->unknown_0120 = nullptr; +} + // OFFSET: 0x0099B540 // FUNCTION: fn_13554 void UIMiniMapWnd::AddTownMarks() { diff --git a/Source/UI/Dialogs/UIEditctrlWnd.h b/Source/UI/Dialogs/UIEditctrlWnd.h index 5bdeb0ca..1b78e3db 100644 --- a/Source/UI/Dialogs/UIEditctrlWnd.h +++ b/Source/UI/Dialogs/UIEditctrlWnd.h @@ -9,6 +9,7 @@ class UIEditCtrl; class UIEditctrlWnd : public UIFrameWnd { public: + UIEditctrlWnd(UIWindowContext& windows, UIFrameContext& frames, UIButtonContext& controls, UIEditContext& edit); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; diff --git a/Source/UI/Dialogs/UIMiniMapWnd.h b/Source/UI/Dialogs/UIMiniMapWnd.h index a8d149f4..53601a0d 100644 --- a/Source/UI/Dialogs/UIMiniMapWnd.h +++ b/Source/UI/Dialogs/UIMiniMapWnd.h @@ -18,6 +18,7 @@ struct MiniMapMark { class UIMiniMapWnd : public UIFrameWnd { public: + UIMiniMapWnd(UIWindowContext& windows, UIFrameContext& frames, UIButtonContext& controls); void Slot11() override; void Slot15(int width, int height) override; void Paint() override; @@ -32,7 +33,7 @@ public: /* 00BC */ float originX; /* 00C0 */ float originY; /* 00C4 */ UIBitmapButton* memoButtons[20]; - /* 0114 */ unsigned char unknown_0114[0x4]; + /* 0114 */ int unknown_0114; /* 0118 */ unsigned char dragging; /* 0119 */ unsigned char unknown_0119[0x3]; /* 011C */ UIWindow* unknown_011C; @@ -41,7 +42,8 @@ public: /* 0128 */ UIHeadsprButton* m_playerHead; /* 012C */ UIWindow* unknown_012C; /* 0130 */ std::map townButtons; - /* 0138 */ unsigned char unknown_0138[0x10]; + /* 0138 */ std::map unknown_0138; + /* 0140 */ std::map unknown_0140; /* 0148 */ std::vector partyMarks; /* 0154 */ std::vector guildMarks; /* 0160 */ std::vector warpMarks;