diff --git a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp index aa2019c9..d6a8e1b4 100644 --- a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp +++ b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp @@ -33,6 +33,7 @@ #include "UI/Buttons/UIBitmapButton.h" #include "UI/Buttons/UICheckBox.h" #include "UI/Buttons/UISpriteButton.h" +#include "UI/Chat/UIChatRoomMakeWnd.h" #include "UI/Chat/UIWhisperWnd.h" #include "UI/Edit/UIEditCtrl.h" #include "UI/Edit/UIItemTagCtrl.h" @@ -69,7 +70,10 @@ #include "UI/Items/UIItemParamChangeDisplayWnd.h" #include "UI/Items/UINotifyItemObtainWnd.h" #include "UI/Lists/UIChatHisBox.h" +#include "UI/Lists/UIComboBox.h" #include "UI/Lists/UIComboBoxWnd.h" +#include "UI/Lists/UIListBoxID.h" +#include "UI/Lists/UIScrollBar.h" #include "UI/Lists/UIListBox.h" #include "UI/Party/UIPartySettingWnd.h" #include "UI/Shortcuts/ShortcutVisibility.h" @@ -2729,3 +2733,32 @@ void UIExchangeWnd::Slot15(int, int) { this->m_message0 = 600; } + +// OFFSET: 0x008DE400 +// FUNCTION: fn_12167 +void UIComboBoxIDWnd::Slot15(int width, int height) { + auto* list = new UIComboBoxID(); + this->m_list = list; + list->Configure(0, 0, width, height, 1); + this->AddChild(list); +} + +// OFFSET: 0x008D9F20 +// FUNCTION: fn_12139 +bool IsEquipViewHidden() { + if (g_session.unknown_5C1C > 0) { + return false; + } + + const std::uint32_t flags = g_session.m_jobFlags; + if (StateFlag04(flags) || StateFlag05(flags) || StateFlag19(flags) || StateFlag23(flags) || StateFlag24(flags) || StateFlag25(flags) || + StateFlag26(flags) || StateFlag22(flags)) { + return false; + } + + return true; +} + +// OFFSET: 0x008ED080 + +// OFFSET: 0x008F64B0 diff --git a/Source/UI/Chat/UIChatRoomMakeWnd.h b/Source/UI/Chat/UIChatRoomMakeWnd.h index edb02711..d9280c6f 100644 --- a/Source/UI/Chat/UIChatRoomMakeWnd.h +++ b/Source/UI/Chat/UIChatRoomMakeWnd.h @@ -10,6 +10,7 @@ class UIChatRoomMakeWnd : public UIFrameWnd { public: UIChatRoomMakeWnd(UIWindowContext& windows, UIFrameContext& frames); + void Paint() override; /* 00B4 */ std::string m_title; /* 00CC */ unsigned char unknown_00CC[0x2C]; diff --git a/Source/UI/Items/UIItemIdentifyWnd.h b/Source/UI/Items/UIItemIdentifyWnd.h index ba46e2b7..7f750969 100644 --- a/Source/UI/Items/UIItemIdentifyWnd.h +++ b/Source/UI/Items/UIItemIdentifyWnd.h @@ -19,6 +19,7 @@ public: /* 00EC */ WindowPlacement* m_placement; void Slot11() override; + void UpdateScroll(); void Slot25(int x, int y) override; void Slot26(int x, int y) override; void Slot33(int x, int y) override; diff --git a/Source/UI/Lists/UIComboBoxWnd.h b/Source/UI/Lists/UIComboBoxWnd.h index 61005844..0bfe371d 100644 --- a/Source/UI/Lists/UIComboBoxWnd.h +++ b/Source/UI/Lists/UIComboBoxWnd.h @@ -4,6 +4,7 @@ #include "UI/Window/UIFrameWnd.h" class UIListBox; +class UIListBoxID; class UIComboBoxWnd : public UIFrameWnd { public: @@ -19,10 +20,11 @@ public: class UIComboBoxIDWnd : public UIFrameWnd { public: - /* 00B4 */ UIListBox* m_list; + /* 00B4 */ UIListBoxID* m_list; /* 00B8 */ UIWindow* m_owner; void Resize(int width, int height) override; + 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; };