From 4777d84f85afeaaf6f01f39a8a950187d7ecc1ef Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Mon, 2 Nov 2026 21:19:08 +0000 Subject: [PATCH] Maintenance: [forced, user-approved] Family G2: remove invented UIComboBoxContext and UIComboBoxHeaderContext. Only field read was UI Batch #10194 by ragnarok-clanker: forced by an admin (9 lower score(s), 35 changed function(s)); checked with 35 compiled unit(s), including every includer of Source/UI/Lists/UIComboBoxDefWnd.h, Source/UI/Lists/UIComboBoxEx.h, Source/UI/Lists/UIItemStoreComboBox.h, Source/UI/Party/UIAdvenPartyBoardWnd.h, Source/UI/Party/UIRegisterPartyWnd.h, Source/UI/UIReputeWnd.h, Source/UI/Window/UINavigationWnd.h, Source/UI/Window/UISecondCostumeWnd.h, Source/UI/Window/UISeekPartyListWnd.h, Source/UI/Window/UISeekPartyMBWnd.h. --- Source/UI/Lists/UIComboBoxDefWnd.cpp | 14 +++++++------- Source/UI/Lists/UIComboBoxDefWnd.h | 15 ++++----------- Source/UI/Lists/UIComboBoxEx.cpp | 6 +++--- Source/UI/Lists/UIComboBoxEx.h | 14 ++++---------- Source/UI/Lists/UIItemStoreComboBox.cpp | 6 +++--- Source/UI/Lists/UIItemStoreComboBox.h | 4 ++-- Source/UI/Party/UIAdvenPartyBoardWnd.cpp | 2 +- Source/UI/Party/UIAdvenPartyBoardWnd.h | 2 -- Source/UI/Party/UIRegisterPartyWnd.cpp | 2 +- Source/UI/Party/UIRegisterPartyWnd.h | 2 -- Source/UI/UIReputeWnd.cpp | 2 +- Source/UI/UIReputeWnd.h | 2 -- Source/UI/Window/UINavigationWnd.cpp | 2 +- Source/UI/Window/UINavigationWnd.h | 2 -- Source/UI/Window/UISecondCostumeWnd.cpp | 8 +++----- Source/UI/Window/UISecondCostumeWnd.h | 4 +--- Source/UI/Window/UISeekPartyListWnd.cpp | 8 ++++---- Source/UI/Window/UISeekPartyListWnd.h | 2 -- Source/UI/Window/UISeekPartyMBWnd.cpp | 6 +++--- Source/UI/Window/UISeekPartyMBWnd.h | 2 -- 20 files changed, 38 insertions(+), 67 deletions(-) diff --git a/Source/UI/Lists/UIComboBoxDefWnd.cpp b/Source/UI/Lists/UIComboBoxDefWnd.cpp index 08b5847f..50447529 100644 --- a/Source/UI/Lists/UIComboBoxDefWnd.cpp +++ b/Source/UI/Lists/UIComboBoxDefWnd.cpp @@ -35,9 +35,9 @@ namespace { // OFFSET: 0x0086CC20 // FUNCTION: fn_11035 -UIComboBoxDefWnd::UIComboBoxDefWnd(UIWindowContext& windows, UIComboBoxHeaderContext& controls) +UIComboBoxDefWnd::UIComboBoxDefWnd(UIWindowContext& windows) : UIWindow(windows, 0), button(nullptr), list(nullptr), label(nullptr), borderless(0), expanded(0), red(255), green(255), blue(255), borderRed(0), - borderGreen(0), borderBlue(0), dropdownHeight(40), m_controls(&controls) { + borderGreen(0), borderBlue(0), dropdownHeight(40) { } // OFFSET: 0x00872AE0 @@ -59,7 +59,7 @@ void UIComboBoxDefWnd::Slot15(int, int) { this->button->SetId(273); this->AddChild(this->button); - this->list = new UIComboBoxEx(*this->m_context, this->m_controls->combo); + this->list = new UIComboBoxEx(*this->m_context); this->list->SetSize(this->geometry.width, this->dropdownHeight); this->list->Move(0, this->button->BitmapHeight()); this->AddChild(this->list); @@ -88,7 +88,7 @@ void UIComboBox_BmpWnd::Create(int width, int height, const char* path, const ch this->button->SetId(273); this->AddChild(this->button); - this->list = new UIComboBoxEx(*this->m_context, this->m_controls->combo); + this->list = new UIComboBoxEx(*this->m_context); this->list->SetSize(this->geometry.width, this->dropdownHeight); this->list->Move(0, this->button->BitmapHeight()); this->AddChild(this->list); @@ -256,8 +256,8 @@ int UIItemStoreComboBoxWnd::SendMsg(UIWindow* sender, int message, std::intptr_t // OFFSET: 0x0086CBA0 // FUNCTION: fn_11034 -UIComboBoxDef2Wnd::UIComboBoxDef2Wnd(UIWindowContext& windows, UIComboBoxHeaderContext& controls) - : UIComboBoxDefWnd(windows, controls), skin(0), alignment(0), textOffset(0), previousTextX(0) { +UIComboBoxDef2Wnd::UIComboBoxDef2Wnd(UIWindowContext& windows) + : UIComboBoxDefWnd(windows), skin(0), alignment(0), textOffset(0), previousTextX(0) { } // OFFSET: 0x00872A70 @@ -281,7 +281,7 @@ void UIComboBoxDef2Wnd::Slot15(int width, int) { this->button->SetId(273); this->AddChild(this->button); - auto* list = new UIComboBoxEx2(*this->m_context, this->m_controls->combo); + auto* list = new UIComboBoxEx2(*this->m_context); this->list = list; list->alignment = this->alignment; list->SetSize(width, (this->dropdownHeight + 2)); diff --git a/Source/UI/Lists/UIComboBoxDefWnd.h b/Source/UI/Lists/UIComboBoxDefWnd.h index e5f1d9c8..203e7074 100644 --- a/Source/UI/Lists/UIComboBoxDefWnd.h +++ b/Source/UI/Lists/UIComboBoxDefWnd.h @@ -7,14 +7,10 @@ class UIBitmapButton; class UIStaticText; -struct UIComboBoxHeaderContext { - UIComboBoxContext& combo; -}; - class UIComboBoxDefWnd : public UIWindow { public: UIComboBoxDefWnd(); - UIComboBoxDefWnd(UIWindowContext& windows, UIComboBoxHeaderContext& controls); + UIComboBoxDefWnd(UIWindowContext& windows); ~UIComboBoxDefWnd() override; void Slot15(int width, int height) override; void Paint() override; @@ -37,9 +33,6 @@ public: /* 009C */ int borderGreen; /* 00A0 */ int borderBlue; /* 00A4 */ int dropdownHeight; - -protected: - UIComboBoxHeaderContext* m_controls; }; class UINewComboBoxCtrl : public UIWindow { @@ -72,7 +65,7 @@ public: class UIComboBoxDef2Wnd : public UIComboBoxDefWnd { public: UIComboBoxDef2Wnd(); - UIComboBoxDef2Wnd(UIWindowContext& windows, UIComboBoxHeaderContext& controls); + UIComboBoxDef2Wnd(UIWindowContext& windows); ~UIComboBoxDef2Wnd() override; void Slot15(int width, int height) override; void Paint() override; @@ -93,8 +86,8 @@ public: }; #if defined(_WIN32) && !defined(_WIN64) -static_assert(sizeof(UIComboBoxDefWnd) == 176); -static_assert(sizeof(UIComboBoxDef2Wnd) == 192); +static_assert(sizeof(UIComboBoxDefWnd) == 172); +static_assert(sizeof(UIComboBoxDef2Wnd) == 188); #endif #endif diff --git a/Source/UI/Lists/UIComboBoxEx.cpp b/Source/UI/Lists/UIComboBoxEx.cpp index 195b24b0..51560887 100644 --- a/Source/UI/Lists/UIComboBoxEx.cpp +++ b/Source/UI/Lists/UIComboBoxEx.cpp @@ -26,7 +26,7 @@ namespace { // OFFSET: 0x0086CD40 // FUNCTION: fn_11037 -UIComboBoxEx::UIComboBoxEx(UIWindowContext& windows, UIComboBoxContext& combo) : UIListBoxEx(windows), targetId(10041), m_combo(&combo) { +UIComboBoxEx::UIComboBoxEx(UIWindowContext& windows) : UIListBoxEx(windows), targetId(10041) { } // OFFSET: 0x00872C00 @@ -148,7 +148,7 @@ int UIComboBoxEx::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::i target->SendMsg(nullptr, 39, this->selected, 0, 0, 0); } - if (this->m_combo->popup) { + if (g_windowMgr.unknown_0214) { g_windowMgr.CloseWindow(26); } @@ -266,7 +266,7 @@ void UIComboBoxEx::Paint() { // OFFSET: 0x0086CCE0 // FUNCTION: fn_11036 -UIComboBoxEx2::UIComboBoxEx2(UIWindowContext& windows, UIComboBoxContext& combo) : UIComboBoxEx(windows, combo), alignment(0) { +UIComboBoxEx2::UIComboBoxEx2(UIWindowContext& windows) : UIComboBoxEx(windows), alignment(0) { } // OFFSET: 0x008706D0 diff --git a/Source/UI/Lists/UIComboBoxEx.h b/Source/UI/Lists/UIComboBoxEx.h index e6eadd2e..6249f06e 100644 --- a/Source/UI/Lists/UIComboBoxEx.h +++ b/Source/UI/Lists/UIComboBoxEx.h @@ -3,14 +3,9 @@ #include "UI/Lists/UIListBoxEx.h" -struct UIComboBoxContext { - - UIWindow* const& popup; -}; - class UIComboBoxEx : public UIListBoxEx { public: - UIComboBoxEx(UIWindowContext& windows, UIComboBoxContext& combo); + UIComboBoxEx(UIWindowContext& windows); ~UIComboBoxEx() override; void Resize(int width, int height) override; void Slot15(int width, int height) override; @@ -26,13 +21,12 @@ public: /* 00C0 */ int targetId; protected: - UIComboBoxContext* m_combo; void DrawRows(bool centered); }; class UIComboBoxEx2 : public UIComboBoxEx { public: - UIComboBoxEx2(UIWindowContext& windows, UIComboBoxContext& combo); + UIComboBoxEx2(UIWindowContext& windows); ~UIComboBoxEx2() override; void Resize(int width, int height) override; void Slot15(int width, int height) override; @@ -42,8 +36,8 @@ public: }; #if defined(_WIN32) && !defined(_WIN64) -static_assert(sizeof(UIComboBoxEx) == 208); -static_assert(sizeof(UIComboBoxEx2) == 212); +static_assert(sizeof(UIComboBoxEx) == 204); +static_assert(sizeof(UIComboBoxEx2) == 208); #endif #endif diff --git a/Source/UI/Lists/UIItemStoreComboBox.cpp b/Source/UI/Lists/UIItemStoreComboBox.cpp index f7324edd..7f5303b0 100644 --- a/Source/UI/Lists/UIItemStoreComboBox.cpp +++ b/Source/UI/Lists/UIItemStoreComboBox.cpp @@ -9,7 +9,7 @@ // OFFSET: 0x0086D530 // FUNCTION: fn_11047 UIItemStoreComboBox::UIItemStoreComboBox() - : UIComboBoxEx(*reinterpret_cast(nullptr), *reinterpret_cast(nullptr)), pink(false) { + : UIComboBoxEx(*reinterpret_cast(nullptr)), pink(false) { } // OFFSET: 0x00886200 @@ -28,7 +28,7 @@ void UIItemStoreComboBoxWnd::Slot15(int, int) { this->button->SetId(273); this->AddChild(this->button); - UIItemStoreComboBox* items = new UIItemStoreComboBox(*this->m_context, this->m_controls->combo); + UIItemStoreComboBox* items = new UIItemStoreComboBox(*this->m_context); this->list = items; items->pink = this->pink != 0; this->list->SetSize(62, 45); @@ -48,5 +48,5 @@ void UIItemStoreComboBoxWnd::Slot15(int, int) { // OFFSET: 0x0086D590 // FUNCTION: fn_11048 -UIItemStoreComboBoxWnd::UIItemStoreComboBoxWnd(UIWindowContext& windows, UIComboBoxHeaderContext& controls) : UIComboBoxDefWnd(windows, controls), pink(0) { +UIItemStoreComboBoxWnd::UIItemStoreComboBoxWnd(UIWindowContext& windows) : UIComboBoxDefWnd(windows), pink(0) { } diff --git a/Source/UI/Lists/UIItemStoreComboBox.h b/Source/UI/Lists/UIItemStoreComboBox.h index adefafc1..6fcb7a53 100644 --- a/Source/UI/Lists/UIItemStoreComboBox.h +++ b/Source/UI/Lists/UIItemStoreComboBox.h @@ -7,7 +7,7 @@ class UIItemStoreComboBox : public UIComboBoxEx { public: UIItemStoreComboBox(); - UIItemStoreComboBox(UIWindowContext& windows, UIComboBoxContext& combo) : UIComboBoxEx(windows, combo), pink(false) {} + UIItemStoreComboBox(UIWindowContext& windows) : UIComboBoxEx(windows), pink(false) {} void Slot15(int width, int height) override; void Paint() override; void Slot27(int x, int y) override; @@ -18,7 +18,7 @@ public: class UIItemStoreComboBoxWnd : public UIComboBoxDefWnd { public: - UIItemStoreComboBoxWnd(UIWindowContext& windows, UIComboBoxHeaderContext& controls); + UIItemStoreComboBoxWnd(UIWindowContext& windows); 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; diff --git a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp index bed8a574..4d3e3985 100644 --- a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp +++ b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp @@ -185,7 +185,7 @@ void UIAdvenPartyBoardWnd::Slot15(int, int) { recruit->Enable(0); this->AddChild(recruit); - this->types = new UIComboBoxDef2Wnd(*this->m_context, owner.combos); + this->types = new UIComboBoxDef2Wnd(*this->m_context); this->types->dropdownHeight = 126; this->types->SetSize(76, 18); this->types->Move(76, 22); diff --git a/Source/UI/Party/UIAdvenPartyBoardWnd.h b/Source/UI/Party/UIAdvenPartyBoardWnd.h index d1efbaa9..15b3037b 100644 --- a/Source/UI/Party/UIAdvenPartyBoardWnd.h +++ b/Source/UI/Party/UIAdvenPartyBoardWnd.h @@ -14,7 +14,6 @@ class UIEditCtrl; class UIJobSlotButton; class UIComboBoxDef2Wnd; class UIPartyInfoWnd; -struct UIComboBoxHeaderContext; struct PartyRowContext; struct ExtendedListLine; struct PartyBoardPlacement { @@ -29,7 +28,6 @@ struct StopRecruitingContext; struct WindowOrdering; struct UIAdvenPartyBoardContext { - UIComboBoxHeaderContext& combos; PartyRowContext& rows; AgencyRequestContext& requests; StopRecruitingContext& stopCompletion; diff --git a/Source/UI/Party/UIRegisterPartyWnd.cpp b/Source/UI/Party/UIRegisterPartyWnd.cpp index 48b0fdcc..90eeead2 100644 --- a/Source/UI/Party/UIRegisterPartyWnd.cpp +++ b/Source/UI/Party/UIRegisterPartyWnd.cpp @@ -174,7 +174,7 @@ void UIRegisterPartyWnd::Slot15(int, int) { close->SetId(201); this->AddChild(close); - this->types = new UIComboBoxDef2Wnd(*this->m_context, owner.combos); + this->types = new UIComboBoxDef2Wnd(*this->m_context); this->types->dropdownHeight = 126; this->types->SetSize(63, 18); this->types->Move(60, 70); diff --git a/Source/UI/Party/UIRegisterPartyWnd.h b/Source/UI/Party/UIRegisterPartyWnd.h index ed45d17c..798360db 100644 --- a/Source/UI/Party/UIRegisterPartyWnd.h +++ b/Source/UI/Party/UIRegisterPartyWnd.h @@ -12,10 +12,8 @@ class UIBasicButton; class ForbiddenWords; struct AgencyRequestContext; struct RegisterPartyContext; -struct UIComboBoxHeaderContext; struct UIRegisterPartyContext { - UIComboBoxHeaderContext& combos; ForbiddenWords& forbidden; AgencyRequestContext& requests; RegisterPartyContext& completion; diff --git a/Source/UI/UIReputeWnd.cpp b/Source/UI/UIReputeWnd.cpp index da155e29..cfeb2b0f 100644 --- a/Source/UI/UIReputeWnd.cpp +++ b/Source/UI/UIReputeWnd.cpp @@ -51,7 +51,7 @@ void UIReputeWnd::Slot15(int width, int height) { this->AddBaseButton(); this->AddCloseButton("", 0); - this->m_groupCombo = new UIComboBoxDefWnd(*this->m_context, *this->m_comboContext); + this->m_groupCombo = new UIComboBoxDefWnd(*this->m_context); this->m_groupCombo->dropdownHeight = 160; this->m_groupCombo->SetSize(122, 18); this->m_groupCombo->Move(8, 25); diff --git a/Source/UI/UIReputeWnd.h b/Source/UI/UIReputeWnd.h index 25106b1d..001c5392 100644 --- a/Source/UI/UIReputeWnd.h +++ b/Source/UI/UIReputeWnd.h @@ -12,7 +12,6 @@ struct ReputeInfo; class UIBitmapButton; class UIComboBoxDefWnd; class UIEditCtrl; -struct UIComboBoxHeaderContext; class UIReputeWnd : public UIFrameWnd { public: @@ -38,7 +37,6 @@ public: protected: void* unknown_controls; - UIComboBoxHeaderContext* m_comboContext; }; #include "Contents/ReputeMgrLoad.inl" diff --git a/Source/UI/Window/UINavigationWnd.cpp b/Source/UI/Window/UINavigationWnd.cpp index 4d5f866a..5a0f9691 100644 --- a/Source/UI/Window/UINavigationWnd.cpp +++ b/Source/UI/Window/UINavigationWnd.cpp @@ -152,7 +152,7 @@ void UINavigationWnd::Slot15(int width, int height) { this->unknown_0120->SetTooltip(LookupMessage(0x89D)); this->AddChild(this->unknown_0120); - this->unknown_00EC = new UIComboBoxDefWnd(*this->m_context, *this->m_comboContext); + this->unknown_00EC = new UIComboBoxDefWnd(*this->m_context); this->unknown_00EC->dropdownHeight = 67; this->unknown_00EC->SetSize(56, 18); this->unknown_00EC->Move(-1000, -1000); diff --git a/Source/UI/Window/UINavigationWnd.h b/Source/UI/Window/UINavigationWnd.h index f358f9d2..481ce86b 100644 --- a/Source/UI/Window/UINavigationWnd.h +++ b/Source/UI/Window/UINavigationWnd.h @@ -17,7 +17,6 @@ class UIComboBoxDefWnd; class UIEditCtrl; class UIListBoxNavi; class UIResizer; -struct UIComboBoxHeaderContext; struct WindowDialogs; struct WindowResponseRecorder; @@ -92,7 +91,6 @@ protected: void* unknown_controls; void* unknown_listContext; - UIComboBoxHeaderContext* m_comboContext; WindowResponseRecorder* m_recorder; WindowDialogs* m_dialogs; }; diff --git a/Source/UI/Window/UISecondCostumeWnd.cpp b/Source/UI/Window/UISecondCostumeWnd.cpp index 2b7a1f69..e557d482 100644 --- a/Source/UI/Window/UISecondCostumeWnd.cpp +++ b/Source/UI/Window/UISecondCostumeWnd.cpp @@ -170,7 +170,7 @@ void UISecondCostumeWnd::Slot15(int width, int height) { this->AddChild(this->m_list); this->RefreshList(this->m_tab); - this->m_typeCombo = new UIComboBoxDefWnd(*this->m_context, *this->m_comboContext); + this->m_typeCombo = new UIComboBoxDefWnd(*this->m_context); this->m_typeCombo->dropdownHeight = 67; this->m_typeCombo->SetSize(width - 212, 18); this->m_typeCombo->Move(4, 20); @@ -287,10 +287,8 @@ bool UISecondCostumeWnd::Slot03() { // OFFSET: 0x00946FB0 // FUNCTION: fn_12857 -UISecondCostumeWnd::UISecondCostumeWnd( - UIWindowContext& windows, UIComboBoxHeaderContext& combos -) - : UIFrameWnd(windows, 0), m_comboContext(&combos) { +UISecondCostumeWnd::UISecondCostumeWnd(UIWindowContext& windows) + : UIFrameWnd(windows, 0) { this->m_typeCombo = nullptr; this->m_list = nullptr; this->m_tab = 0; diff --git a/Source/UI/Window/UISecondCostumeWnd.h b/Source/UI/Window/UISecondCostumeWnd.h index 1ec612d7..f61f034c 100644 --- a/Source/UI/Window/UISecondCostumeWnd.h +++ b/Source/UI/Window/UISecondCostumeWnd.h @@ -10,7 +10,6 @@ class UIComboBoxDefWnd; class UIListBox; -struct UIComboBoxHeaderContext; struct SecondCostumeEntry { /* 0000 */ std::string name; @@ -19,7 +18,7 @@ struct SecondCostumeEntry { class UISecondCostumeWnd : public UIFrameWnd { public: - UISecondCostumeWnd(UIWindowContext& windows, UIComboBoxHeaderContext& combos); + UISecondCostumeWnd(UIWindowContext& windows); bool Slot03() override; void Slot15(int width, int height) override; void Paint() override; @@ -40,7 +39,6 @@ protected: /* 0104 */ int m_page; void* unknown_controls; void* unknown_listContext; - UIComboBoxHeaderContext* m_comboContext; /* 0108 */ std::string unknown_0108[7]; /* 01B0 */ std::string unknown_01B0[7]; }; diff --git a/Source/UI/Window/UISeekPartyListWnd.cpp b/Source/UI/Window/UISeekPartyListWnd.cpp index e4d0205c..694d88f3 100644 --- a/Source/UI/Window/UISeekPartyListWnd.cpp +++ b/Source/UI/Window/UISeekPartyListWnd.cpp @@ -125,7 +125,7 @@ void UISeekPartyListWnd::Slot15(int width, int height) { this->m_scrollBar->Configure(0x203, 0x78, 1, 200); this->AddChild(this->m_scrollBar); - this->m_jobCategoryCombo = new UIComboBoxDefWnd(*this->m_context, *this->m_comboContext); + this->m_jobCategoryCombo = new UIComboBoxDefWnd(*this->m_context); this->m_jobCategoryCombo->dropdownHeight = 0x50; this->m_jobCategoryCombo->SetSize(0x96, 0x12); this->m_jobCategoryCombo->Move(0x32, 0x44); @@ -137,7 +137,7 @@ void UISeekPartyListWnd::Slot15(int width, int height) { this->m_jobCategoryCombo->blue = 0xE8; this->AddChild(this->m_jobCategoryCombo); - this->m_jobCombo = new UIComboBoxDefWnd(*this->m_context, *this->m_comboContext); + this->m_jobCombo = new UIComboBoxDefWnd(*this->m_context); this->m_jobCombo->dropdownHeight = 0x50; this->m_jobCombo->SetSize(200, 0x12); this->m_jobCombo->Move(0xDC, 0x44); @@ -149,7 +149,7 @@ void UISeekPartyListWnd::Slot15(int width, int height) { this->m_jobCombo->blue = 0xE8; this->AddChild(this->m_jobCombo); - this->m_regionCombo = new UIComboBoxDefWnd(*this->m_context, *this->m_comboContext); + this->m_regionCombo = new UIComboBoxDefWnd(*this->m_context); this->m_regionCombo->dropdownHeight = 0x50; this->m_regionCombo->SetSize(0x96, 0x12); this->m_regionCombo->Move(0x32, 0x2B); @@ -161,7 +161,7 @@ void UISeekPartyListWnd::Slot15(int width, int height) { this->m_regionCombo->blue = 0xE8; this->AddChild(this->m_regionCombo); - this->m_mapCombo = new UIComboBoxDefWnd(*this->m_context, *this->m_comboContext); + this->m_mapCombo = new UIComboBoxDefWnd(*this->m_context); this->m_mapCombo->dropdownHeight = 0x50; this->m_mapCombo->SetSize(200, 0x12); this->m_mapCombo->Move(0xDC, 0x2B); diff --git a/Source/UI/Window/UISeekPartyListWnd.h b/Source/UI/Window/UISeekPartyListWnd.h index 2a8af90b..b23c0c2c 100644 --- a/Source/UI/Window/UISeekPartyListWnd.h +++ b/Source/UI/Window/UISeekPartyListWnd.h @@ -17,7 +17,6 @@ class UIScrollBar; class UIStaticText; class UITextButton; struct SeekPartyListWndInfo; -struct UIComboBoxHeaderContext; extern std::map g_friendRows; @@ -91,7 +90,6 @@ protected: /* 01D0 */ SeekPartyListWndInfo* m_saved; UIStaticText* m_footerText; void* unknown_controls; - UIComboBoxHeaderContext* m_comboContext; }; #endif diff --git a/Source/UI/Window/UISeekPartyMBWnd.cpp b/Source/UI/Window/UISeekPartyMBWnd.cpp index b6095092..bd0fbedd 100644 --- a/Source/UI/Window/UISeekPartyMBWnd.cpp +++ b/Source/UI/Window/UISeekPartyMBWnd.cpp @@ -343,7 +343,7 @@ void UISeekPartyMBWnd::Slot15(int width, int height) { } this->AddChild(this->m_levelEdit); - this->m_jobCategoryCombo = new UIComboBoxDefWnd(*this->m_context, *this->m_comboContext); + this->m_jobCategoryCombo = new UIComboBoxDefWnd(*this->m_context); this->m_jobCategoryCombo->dropdownHeight = 0x50; this->m_jobCategoryCombo->SetSize(0x96, 0x12); this->m_jobCategoryCombo->Move(0x32, 0x44); @@ -355,7 +355,7 @@ void UISeekPartyMBWnd::Slot15(int width, int height) { this->m_jobCategoryCombo->blue = 0xE8; this->AddChild(this->m_jobCategoryCombo); - this->m_typeCombo = new UIComboBoxDefWnd(*this->m_context, *this->m_comboContext); + this->m_typeCombo = new UIComboBoxDefWnd(*this->m_context); this->m_typeCombo->dropdownHeight = 0x50; this->m_typeCombo->SetSize(0x64, 0x12); this->m_typeCombo->Move(0x32, 0x2B); @@ -367,7 +367,7 @@ void UISeekPartyMBWnd::Slot15(int width, int height) { this->m_typeCombo->blue = 0xE8; this->AddChild(this->m_typeCombo); - this->m_subTypeCombo = new UIComboBoxDefWnd(*this->m_context, *this->m_comboContext); + this->m_subTypeCombo = new UIComboBoxDefWnd(*this->m_context); this->m_subTypeCombo->dropdownHeight = 0x50; this->m_subTypeCombo->SetSize(0xBE, 0x12); this->m_subTypeCombo->Move(0x9B, 0x2B); diff --git a/Source/UI/Window/UISeekPartyMBWnd.h b/Source/UI/Window/UISeekPartyMBWnd.h index e065dc7e..9cce1988 100644 --- a/Source/UI/Window/UISeekPartyMBWnd.h +++ b/Source/UI/Window/UISeekPartyMBWnd.h @@ -9,7 +9,6 @@ #include #include -struct UIComboBoxHeaderContext; struct SeekPartyMBWndInfo; class UIBitmapButton; class UICheckBox; @@ -59,7 +58,6 @@ protected: void* unknown_controls; UIStaticText* m_titleText; UIStaticText* m_levelText; - UIComboBoxHeaderContext* m_comboContext; }; #endif