diff --git a/Source/UI/Buttons/UITagButton.cpp b/Source/UI/Buttons/UITagButton.cpp index b90ee6ac..9c3ad5b5 100644 --- a/Source/UI/Buttons/UITagButton.cpp +++ b/Source/UI/Buttons/UITagButton.cpp @@ -7,6 +7,8 @@ // GLOBAL: gl_24936 std::string g_emptyString; +// OFFSET: 0x009B52E0 + // OFFSET: 0x009B54A0 // FUNCTION: fn_13844 void UITagButton::Slot31(int x, int y) { diff --git a/Source/UI/Buttons/UITagButton.h b/Source/UI/Buttons/UITagButton.h index b3d51544..ca2c3187 100644 --- a/Source/UI/Buttons/UITagButton.h +++ b/Source/UI/Buttons/UITagButton.h @@ -12,6 +12,8 @@ class UITagButton : public UITextButton { friend class UITagListBox; public: + UITagButton(UIWindowContext& windows, UIButtonContext& buttons); + /* 00F8 */ ITEM_INFO item; /* 01F0 */ std::vector m_strings; diff --git a/Source/UI/Guild/UIGuildWnd.cpp b/Source/UI/Guild/UIGuildWnd.cpp index 6ae03485..c372154e 100644 --- a/Source/UI/Guild/UIGuildWnd.cpp +++ b/Source/UI/Guild/UIGuildWnd.cpp @@ -1163,8 +1163,8 @@ void UIGuildSkillWnd::UpdateSkillButtons() { } else { this->m_levelUpButtons[row]->Move(-200, y - 17); } - this->unknown_00FC[row]->Move(-200, y); - this->unknown_00E0[row]->Move(-200, y); + this->m_previousButtons[row]->Move(-200, y); + this->m_nextButtons[row]->Move(-200, y); } } @@ -2118,4 +2118,6 @@ UIGuildTotalInfoWnd::UIGuildTotalInfoWnd(UIWindowContext& windows, UIFrameContex UIListBoxAgitMenu::UIListBoxAgitMenu(UIWindowContext& windows, UIListBoxContext& list) : UIListBox(windows, list) { } +// OFFSET: 0x0095BF90 + // OFFSET: 0x00963E10 diff --git a/Source/UI/Guild/UIGuildWnd.h b/Source/UI/Guild/UIGuildWnd.h index dd5b6efa..37667781 100644 --- a/Source/UI/Guild/UIGuildWnd.h +++ b/Source/UI/Guild/UIGuildWnd.h @@ -225,6 +225,7 @@ protected: class UIGuildSkillWnd : public UIGuildWnd { public: int Tab() override; + void Slot15(int width, int height) override; void Paint() override; void Slot25(int x, int y) override; void Slot32(int x, int y) override; @@ -241,10 +242,10 @@ protected: /* 00D0 */ unsigned char unknown_00D0[0x04]; /* 00D4 */ UIScrollBar* m_scrollBar; - /* 00D8 */ unsigned char unknown_00D8[0x08]; - /* 00E0 */ UIWindow* unknown_00E0[7]; - /* 00FC */ UIWindow* unknown_00FC[7]; - /* 0118 */ UIWindow* m_levelUpButtons[7]; + /* 00D8 */ UIBitmapButton* m_actionButtons[2]; + /* 00E0 */ UIBitmapButton* m_nextButtons[7]; + /* 00FC */ UIBitmapButton* m_previousButtons[7]; + /* 0118 */ UIBitmapButton* m_levelUpButtons[7]; /* 0134 */ int m_hoverIndex; /* 0138 */ int m_scrollTop; /* 013C */ int m_columns; diff --git a/Source/UI/UIMacroReport.cpp b/Source/UI/UIMacroReport.cpp index 4b165d4e..80061c56 100644 --- a/Source/UI/UIMacroReport.cpp +++ b/Source/UI/UIMacroReport.cpp @@ -95,3 +95,5 @@ void CUIMacroReport::Reset() { this->Slot15(this->geometry.width, this->geometry.height); this->Slot16(); } + +// OFFSET: 0x00A44170 diff --git a/Source/UI/UIMacroReport.h b/Source/UI/UIMacroReport.h index 2c1bb144..8316a775 100644 --- a/Source/UI/UIMacroReport.h +++ b/Source/UI/UIMacroReport.h @@ -27,7 +27,7 @@ public: /* 0104 */ int m_reportType; /* 0108 */ std::string unknown_0108; - CUIMacroReport(); + __declspec(noinline) CUIMacroReport(); void Slot16() override; virtual void Reset(); diff --git a/Source/UI/Window/UIControl.cpp b/Source/UI/Window/UIControl.cpp index b2567f86..3514a406 100644 --- a/Source/UI/Window/UIControl.cpp +++ b/Source/UI/Window/UIControl.cpp @@ -1370,6 +1370,12 @@ bool CUIRadioItem::IsChecked() { } // OFFSET: 0x009E7D60 +// FUNCTION: fn_14486 +CUIImageTextButton::CUIImageTextButton(UIWindowContext& context) : CUITextButton(context), images(), disabledImage(), imageNames(), disabledName() { + this->textColors[0] = 0; + this->textColors[1] = 0; + this->textColors[2] = 0; +} // OFFSET: 0x009E7EB0 // FUNCTION: fn_14487 diff --git a/Source/UI/Window/UITransMenuWnd.cpp b/Source/UI/Window/UITransMenuWnd.cpp index 0c47c3b6..e6f13756 100644 --- a/Source/UI/Window/UITransMenuWnd.cpp +++ b/Source/UI/Window/UITransMenuWnd.cpp @@ -111,3 +111,5 @@ UITransMenuWnd::UITransMenuWnd(UIWindowContext& windows, UIFrameContext& frames, this->m_selected = -1; this->m_items.reserve(8); } + +// OFFSET: 0x009487A0 diff --git a/Source/UI/Window/UITransMenuWnd.h b/Source/UI/Window/UITransMenuWnd.h index c78a6cd3..6f9bdbe9 100644 --- a/Source/UI/Window/UITransMenuWnd.h +++ b/Source/UI/Window/UITransMenuWnd.h @@ -24,6 +24,7 @@ public: void Slot25(int x, int y) override; void Slot27(int x, int y) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; + void ClearItems(); protected: /* 00B4 */ std::vector m_items;