diff --git a/Source/UI/Shortcuts/ShortcutCooldowns.cpp b/Source/UI/Shortcuts/ShortcutCooldowns.cpp index 7182ebfe..a57069d6 100644 --- a/Source/UI/Shortcuts/ShortcutCooldowns.cpp +++ b/Source/UI/Shortcuts/ShortcutCooldowns.cpp @@ -1,4 +1,5 @@ #include "Client/Session.h" +#include "Contents/UserData/NormalItemSlots.h" #include "Resource/Bitmap/BitmapResource.h" #include "Resource/ResourceMgr.h" #include "Resource/SkinPalette.h" @@ -12,6 +13,7 @@ #include "UI/Window/UIRebirthWnd.h" #include "UI/Window/UISeekPartyMBWnd.h" #include "UI/Window/UISeekPartyWnd.h" +#include "UI/Window/UISeekPartyListWnd.h" #include "Utility/Text/FormatString.h" #include "UI/Shortcuts/ShortcutCooldowns.h" @@ -387,3 +389,47 @@ void UISeekPartyWnd::Slot19() { this->Invalidate(); } } + +// OFFSET: 0x00940EE0 +// FUNCTION: fn_12783 +void UIQuickSlotWnd::Slot11() { + if (this->m_saved) { + this->m_saved->width = this->geometry.width; + this->m_saved->height = this->geometry.height; + this->m_saved->x = this->geometry.x; + this->m_saved->y = this->geometry.y; + } +} + +// OFFSET: 0x00940F60 +// FUNCTION: fn_12785 +void UISeekPartyMBWnd::Slot11() { + if (this->m_saved) { + this->m_saved->width = this->geometry.width; + this->m_saved->height = this->geometry.height; + this->m_saved->x = this->geometry.x; + this->m_saved->y = this->geometry.y; + } +} + +// OFFSET: 0x00940FA0 +// FUNCTION: fn_12786 +void UISeekPartyWnd::Slot11() { + if (this->m_saved) { + this->m_saved->width = this->geometry.width; + this->m_saved->height = this->geometry.height; + this->m_saved->x = this->geometry.x; + this->m_saved->y = this->geometry.y; + } +} + +// OFFSET: 0x00940F20 +// FUNCTION: fn_12784 +void UISeekPartyListWnd::Slot11() { + if (this->m_saved) { + this->m_saved->width = this->geometry.width; + this->m_saved->height = this->geometry.height; + this->m_saved->x = this->geometry.x; + this->m_saved->y = this->geometry.y; + } +} diff --git a/Source/UI/Shortcuts/UIQuickSlotWnd.h b/Source/UI/Shortcuts/UIQuickSlotWnd.h index e9798b84..06e068d4 100644 --- a/Source/UI/Shortcuts/UIQuickSlotWnd.h +++ b/Source/UI/Shortcuts/UIQuickSlotWnd.h @@ -35,8 +35,11 @@ struct QuickSlotEntry { }; #pragma pack(pop) +struct QuickSlotWndInfo; + class UIQuickSlotWnd : public UIFrameWnd { public: + void Slot11() override; void Slot15(int width, int height) override; void Slot19() override; void Paint() override; @@ -45,7 +48,7 @@ public: protected: /* 00B4 */ int m_selected; - /* 00B8 */ int unknown_00B8; + /* 00B8 */ QuickSlotWndInfo* m_saved; /* 00BC */ QuickSlotEntry m_entries[2]; QuickSlotPainting* m_painting; }; diff --git a/Source/UI/Window/UISeekPartyListWnd.h b/Source/UI/Window/UISeekPartyListWnd.h index c6aace54..ec00a7f4 100644 --- a/Source/UI/Window/UISeekPartyListWnd.h +++ b/Source/UI/Window/UISeekPartyListWnd.h @@ -6,9 +6,11 @@ class UICheckBox; class UIScrollBar; +struct SeekPartyListWndInfo; class UISeekPartyListWnd : public UIFrameWnd { public: + void Slot11() override; void Slot25(int x, int y) override; void Slot26(int x, int y) override; void Slot35(int delta) override; @@ -33,6 +35,8 @@ protected: /* 01C4 */ short m_filterLevel; /* 01C6 */ short m_filterMap; /* 01C8 */ short m_filterJob; + /* 01CA */ unsigned char unknown_01CA[6]; + /* 01D0 */ SeekPartyListWndInfo* m_saved; }; #endif diff --git a/Source/UI/Window/UISeekPartyMBWnd.h b/Source/UI/Window/UISeekPartyMBWnd.h index 660b899c..5d780ca6 100644 --- a/Source/UI/Window/UISeekPartyMBWnd.h +++ b/Source/UI/Window/UISeekPartyMBWnd.h @@ -4,14 +4,18 @@ #include "UI/Window/UIFrameWnd.h" struct UIButtonContext; +struct SeekPartyMBWndInfo; class UISeekPartyMBWnd : public UIFrameWnd { public: + void Slot11() override; void Paint() override; protected: /* 00BC */ unsigned char unknown_00BC[0xAC]; /* 0168 */ unsigned char m_minimized; + /* 0169 */ unsigned char unknown_0169[0x13]; + /* 017C */ SeekPartyMBWndInfo* m_saved; UIButtonContext* m_controls; }; diff --git a/Source/UI/Window/UISeekPartyWnd.h b/Source/UI/Window/UISeekPartyWnd.h index f23ebe97..85a6fafb 100644 --- a/Source/UI/Window/UISeekPartyWnd.h +++ b/Source/UI/Window/UISeekPartyWnd.h @@ -6,9 +6,11 @@ #include struct UIButtonContext; +struct SeekPartyWndInfo; class UISeekPartyWnd : public UIFrameWnd { public: + void Slot11() override; void Slot19() override; void Paint() override; @@ -22,6 +24,8 @@ protected: /* 00D8 */ std::uint32_t m_frameTick; /* 00DC */ unsigned char unknown_00DC[0x108]; /* 01E4 */ unsigned char m_minimized; + /* 01E5 */ unsigned char unknown_01E5[3]; + /* 01E8 */ SeekPartyWndInfo* m_saved; UIButtonContext* m_controls; };