diff --git a/Source/UI/Chat/UISubChatHisWnd.cpp b/Source/UI/Chat/UISubChatHisWnd.cpp index 527798fe..c3d95bf3 100644 --- a/Source/UI/Chat/UISubChatHisWnd.cpp +++ b/Source/UI/Chat/UISubChatHisWnd.cpp @@ -205,3 +205,5 @@ void UISubChatHisWnd::Slot15(int width, int height) { ChatButtonLayout{g_chatInputFlag, this->geometry.width, {&this->m_miniButton, &this->m_stickButton, &this->m_optionButton}}.Apply(); } + +// OFFSET: 0x00912340 diff --git a/Source/UI/Chat/UISubChatHisWnd.h b/Source/UI/Chat/UISubChatHisWnd.h index fc9a52e5..50d62277 100644 --- a/Source/UI/Chat/UISubChatHisWnd.h +++ b/Source/UI/Chat/UISubChatHisWnd.h @@ -1,6 +1,7 @@ #ifndef RAGNAROK_SOURCE_UI_CHAT_UISUBCHATHISWND_H #define RAGNAROK_SOURCE_UI_CHAT_UISUBCHATHISWND_H +#include "Contents/Configuration/ServiceConfiguration.h" #include "UI/Window/UIFrameWnd.h" #include @@ -29,6 +30,7 @@ class UISubChatHisWnd : public UIFrameWnd { public: UISubChatHisWnd(); + UISubChatHisWnd(UIWindowContext& windows, UIFrameContext& frames, UIButtonContext& controls, UIEditContext& edit, UIListBoxContext& list); void Move(int x, int y) override; void Slot11() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Chat/UISubChatMiniWnd.h b/Source/UI/Chat/UISubChatMiniWnd.h index ea4147c8..1b692759 100644 --- a/Source/UI/Chat/UISubChatMiniWnd.h +++ b/Source/UI/Chat/UISubChatMiniWnd.h @@ -5,6 +5,7 @@ class UISubChatMiniWnd : public UIFrameWnd { public: + UISubChatMiniWnd(UIWindowContext& windows, UIFrameContext& frames); void Slot15(int width, int height) override; void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Dialogs/UIMemorialDunWnd.h b/Source/UI/Dialogs/UIMemorialDunWnd.h index c1225c31..d309f8f0 100644 --- a/Source/UI/Dialogs/UIMemorialDunWnd.h +++ b/Source/UI/Dialogs/UIMemorialDunWnd.h @@ -12,6 +12,7 @@ extern int g_memorialDunWndY; class UIMemorialDunWnd : public UIFrameWnd { public: + UIMemorialDunWnd(UIWindowContext& windows, UIFrameContext& frames, UIButtonContext& controls); void Move(int x, int y) override; void Slot15(int width, int height) 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/Shortcuts/UIQuickSlotWnd.cpp b/Source/UI/Shortcuts/UIQuickSlotWnd.cpp index d2ccab28..a8a70f61 100644 --- a/Source/UI/Shortcuts/UIQuickSlotWnd.cpp +++ b/Source/UI/Shortcuts/UIQuickSlotWnd.cpp @@ -171,3 +171,5 @@ void UIQuickSlotWnd::Slot32(int x, int y) { } } } + +// OFFSET: 0x009118C0 diff --git a/Source/UI/Shortcuts/UIQuickSlotWnd.h b/Source/UI/Shortcuts/UIQuickSlotWnd.h index b8800711..e063724f 100644 --- a/Source/UI/Shortcuts/UIQuickSlotWnd.h +++ b/Source/UI/Shortcuts/UIQuickSlotWnd.h @@ -41,6 +41,7 @@ struct QuickSlotWndInfo; class UIQuickSlotWnd : public UIFrameWnd { public: + UIQuickSlotWnd(UIWindowContext& windows, UIFrameContext& frames, QuickSlotPainting& painting); void Slot10(int x, int y, std::intptr_t argument) override; void Slot11() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Shortcuts/UIShortCutWnd.cpp b/Source/UI/Shortcuts/UIShortCutWnd.cpp index 6afa970f..85ded56c 100644 --- a/Source/UI/Shortcuts/UIShortCutWnd.cpp +++ b/Source/UI/Shortcuts/UIShortCutWnd.cpp @@ -1030,3 +1030,7 @@ bool UINavigationWnd::LoadRoute(int index) { this->SendMsg(this, 6, 190, 0, 0, 0); return true; } + +// OFFSET: 0x00911490 + +// OFFSET: 0x00912460 diff --git a/Source/UI/Window/UIChangeNameWnd.cpp b/Source/UI/Window/UIChangeNameWnd.cpp index 3359e279..8288e1de 100644 --- a/Source/UI/Window/UIChangeNameWnd.cpp +++ b/Source/UI/Window/UIChangeNameWnd.cpp @@ -57,3 +57,5 @@ void UIChangeNameWnd::Slot15(int, int) { focus.Set(this->m_edit); this->m_message0 = 184; } + +// OFFSET: 0x00911190 diff --git a/Source/UI/Window/UIChangeNameWnd.h b/Source/UI/Window/UIChangeNameWnd.h index cd2a87e6..aeba979e 100644 --- a/Source/UI/Window/UIChangeNameWnd.h +++ b/Source/UI/Window/UIChangeNameWnd.h @@ -9,6 +9,7 @@ class UIBitmapEditCtrl; class UIChangeNameWnd : public UIFrameWnd { public: + UIChangeNameWnd(UIWindowContext& windows, UIFrameContext& frames, UIButtonContext& controls); void Slot15(int width, int height) override; void Paint() override; int IsNameWithinLimit(std::string name, int limit); diff --git a/Source/UI/Window/UIEscOptionWnd.cpp b/Source/UI/Window/UIEscOptionWnd.cpp index 43a74355..1c2c17ad 100644 --- a/Source/UI/Window/UIEscOptionWnd.cpp +++ b/Source/UI/Window/UIEscOptionWnd.cpp @@ -63,3 +63,5 @@ void UIEscOptionWnd::LayoutButtons() { this->m_buttons[4]->Move(29, this->m_titleHeight + 51); } } + +// OFFSET: 0x00911250 diff --git a/Source/UI/Window/UIEscOptionWnd.h b/Source/UI/Window/UIEscOptionWnd.h index 5f14f72e..d81f4f8e 100644 --- a/Source/UI/Window/UIEscOptionWnd.h +++ b/Source/UI/Window/UIEscOptionWnd.h @@ -1,6 +1,9 @@ #ifndef RAGNAROK_SOURCE_UI_WINDOW_UIESCOPTIONWND_H #define RAGNAROK_SOURCE_UI_WINDOW_UIESCOPTIONWND_H +#include "Client/Mode/CGameMode.h" +#include "Client/Mode/ModeMgr.h" +#include "Contents/Skills/ClientSkills.h" #include "UI/Window/UIFrameWnd.h" class UIButton; @@ -8,6 +11,7 @@ struct UIButtonContext; class UIEscOptionWnd : public UIFrameWnd { public: + UIEscOptionWnd(UIWindowContext& windows, UIFrameContext& frames, UIButtonContext& controls); void Paint() override; void Slot15(int width, int height) override; void LayoutButtons(); diff --git a/Source/UI/Window/UIJobListWnd.cpp b/Source/UI/Window/UIJobListWnd.cpp index 97a491f9..e2f0ea67 100644 --- a/Source/UI/Window/UIJobListWnd.cpp +++ b/Source/UI/Window/UIJobListWnd.cpp @@ -172,3 +172,5 @@ void UIJobListWnd::RefreshJobs() { this->AddChild(this->m_jobChecks[index]); } } + +// OFFSET: 0x00911410 diff --git a/Source/UI/Window/UIJobListWnd.h b/Source/UI/Window/UIJobListWnd.h index bbe255d2..e7c8ce42 100644 --- a/Source/UI/Window/UIJobListWnd.h +++ b/Source/UI/Window/UIJobListWnd.h @@ -15,6 +15,7 @@ extern std::map g_partyBookingJobs; class UIJobListWnd : public UIFrameWnd { public: + UIJobListWnd(UIWindowContext& windows, UIFrameContext& frames, UIButtonContext& controls); void Slot11() override; void Slot15(int width, int height) override; void Paint() override; @@ -25,7 +26,8 @@ protected: /* 00B4 */ UIStaticText* m_title; /* 00B8 */ UICheckBox* m_jobChecks[6]; /* 00D0 */ UIBitmapButton* m_okButton; - /* 00D4 */ unsigned char unknown_00D4[0x18]; + /* 00D4 */ unsigned char unknown_00D4[0x14]; + /* 00E8 */ int unknown_00E8; /* 00EC */ JobListWndInfo* m_saved; UIButtonContext* m_controls; }; diff --git a/Source/UI/Window/UIMiniBtnWnd.cpp b/Source/UI/Window/UIMiniBtnWnd.cpp index 25951d7a..d820056e 100644 --- a/Source/UI/Window/UIMiniBtnWnd.cpp +++ b/Source/UI/Window/UIMiniBtnWnd.cpp @@ -60,3 +60,8 @@ void UIMiniBtnWnd::Toggle() { } this->Invalidate(); } + +// OFFSET: 0x009114F0 +// FUNCTION: fn_12516 +UIMiniBtnWnd::UIMiniBtnWnd(UIWindowContext& windows, UIFrameContext& frames) : UIFrameWnd(windows, frames, 0), m_windowId(-1) { +} diff --git a/Source/UI/Window/UIMiniBtnWnd.h b/Source/UI/Window/UIMiniBtnWnd.h index ade8ac53..f80f9221 100644 --- a/Source/UI/Window/UIMiniBtnWnd.h +++ b/Source/UI/Window/UIMiniBtnWnd.h @@ -7,6 +7,7 @@ class UIMiniBtnWnd : public UIFrameWnd { public: + UIMiniBtnWnd(UIWindowContext& windows, UIFrameContext& frames); void Paint() override; void Slot25(int x, int y) override; void Toggle(); diff --git a/Source/UI/Window/UINavigationHelpWnd.cpp b/Source/UI/Window/UINavigationHelpWnd.cpp index 60310c56..2ffeae9d 100644 --- a/Source/UI/Window/UINavigationHelpWnd.cpp +++ b/Source/UI/Window/UINavigationHelpWnd.cpp @@ -64,3 +64,5 @@ int UINavigationHelpWnd::SendMsg(UIWindow*, int message, std::intptr_t a, std::i } return 0; } + +// OFFSET: 0x009115B0 diff --git a/Source/UI/Window/UINavigationHelpWnd.h b/Source/UI/Window/UINavigationHelpWnd.h index 60169bed..4de878f5 100644 --- a/Source/UI/Window/UINavigationHelpWnd.h +++ b/Source/UI/Window/UINavigationHelpWnd.h @@ -9,6 +9,7 @@ struct UITextViewerContext; class UINavigationHelpWnd : public UIFrameWnd { public: + UINavigationHelpWnd(UIWindowContext& windows, UIFrameContext& frames, UIButtonContext& controls, UITextViewerContext& text); void Slot15(int width, int height) override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; @@ -17,6 +18,7 @@ protected: UIButtonContext* m_controls; UITextViewerContext* m_text; /* 00B4 */ UITextViewer* m_viewer; + /* 00B8 */ int unknown_00B8; }; #endif diff --git a/Source/UI/Window/UIPartyBookingHelpWnd.cpp b/Source/UI/Window/UIPartyBookingHelpWnd.cpp index 3555a54f..672be828 100644 --- a/Source/UI/Window/UIPartyBookingHelpWnd.cpp +++ b/Source/UI/Window/UIPartyBookingHelpWnd.cpp @@ -51,3 +51,5 @@ int UIPartyBookingHelpWnd::SendMsg(UIWindow* sender, int message, std::intptr_t } return 0; } + +// OFFSET: 0x00911860 diff --git a/Source/UI/Window/UIPartyBookingHelpWnd.h b/Source/UI/Window/UIPartyBookingHelpWnd.h index 2ee0b777..4f459fa1 100644 --- a/Source/UI/Window/UIPartyBookingHelpWnd.h +++ b/Source/UI/Window/UIPartyBookingHelpWnd.h @@ -9,6 +9,7 @@ struct UITextViewerContext; class UIPartyBookingHelpWnd : public UIFrameWnd { public: + UIPartyBookingHelpWnd(UIWindowContext& windows, UIFrameContext& frames, UIButtonContext& controls, UITextViewerContext& text); 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/Window/UIRebirthWnd.cpp b/Source/UI/Window/UIRebirthWnd.cpp index ac129c2f..20562b35 100644 --- a/Source/UI/Window/UIRebirthWnd.cpp +++ b/Source/UI/Window/UIRebirthWnd.cpp @@ -68,3 +68,5 @@ int UIRebirthWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argument1 } return 0; } + +// OFFSET: 0x00911950 diff --git a/Source/UI/Window/UIRebirthWnd.h b/Source/UI/Window/UIRebirthWnd.h index 4e44b21b..266b3157 100644 --- a/Source/UI/Window/UIRebirthWnd.h +++ b/Source/UI/Window/UIRebirthWnd.h @@ -7,6 +7,7 @@ struct UIButtonContext; class UIRebirthWnd : public UIFrameWnd { public: + UIRebirthWnd(UIWindowContext& windows, UIFrameContext& frames, UIButtonContext& controls); 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;