From 9df27675182d7b19317a9fb3e271d68e22ba539e Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Tue, 3 Nov 2026 09:28:09 +0000 Subject: [PATCH] Maintenance: [forced, user-approved] Family F2b (completes F2a #10217): UIWindowContext removed entirely. F2a's notes said the lower- Batch #10227 by ragnarok-clanker: forced by an admin (12 lower score(s), 91 changed function(s)); checked with 401 compiled unit(s), including every includer of Source/UI/Buttons/UIBasicButton.h, Source/UI/Buttons/UIBitmapButton.h, Source/UI/Buttons/UIButton.h, Source/UI/Buttons/UICheckBox.h, Source/UI/Buttons/UISpriteButton.h, Source/UI/Buttons/UITextButton.h, Source/UI/Chat/UINewChatWnd.h, Source/UI/Chat/UISubChatMiniWnd.h, Source/UI/Dialogs/UIEditctrlWnd.h, Source/UI/Dialogs/UIMemorialDunWnd.h, Source/UI/Dialogs/UIMiniMapWnd.h, Source/UI/Edit/UIEditCtrl.h, Source/UI/Guild/UIAgitWnd.h, Source/UI/Guild/UIGuildHelperWnd.h, Source/UI/Guild/UIGuildWnd.h, Source/UI/Items/UIItemRepairWnd.h, Source/UI/Items/UIMakeTargetListWnd.h, Source/UI/Items/UIMakeTargetProcessWnd.h, Source/UI/Items/UIMakeTargetResultWnd.h, Source/UI/Items/UIWeaponRefineWnd.h, Source/UI/Lists/UIComboBoxDefWnd.h, Source/UI/Lists/UIListBox.h, Source/UI/Lists/UIListBoxNavi.h, Source/UI/Lists/UIScrollBar.h, Source/UI/Lists/UITabControl.h, Source/UI/Rodex/UIRodexComposeWnd.h, Source/UI/Shortcuts/ShortcutControls.h, Source/UI/Shortcuts/UIShortCutWnd.h, Source/UI/Text/UIStaticText.h, Source/UI/Text/UIStaticText_LF.h, Source/UI/Text/UITextViewer.h, Source/UI/UIScrollWnd.h, Source/UI/Window/UIEmblemWnd.h, Source/UI/Window/UIEscOptionWnd.h, Source/UI/Window/UIFrameWnd.h, Source/UI/Window/UIJobListWnd.h, Source/UI/Window/UIMessageBox.h, Source/UI/Window/UIMileageWnd.h, Source/UI/Window/UIMiniBtnWnd.h, Source/UI/Window/UINavigationHelpWnd.h, Source/UI/Window/UINewSkillListWnd.h, Source/UI/Window/UINoteWnd.h, Source/UI/Window/UIOpenMailBoxWnd.h, Source/UI/Window/UIOpenRoulletteWnd.h, Source/UI/Window/UIPartyBookingHelpWnd.h, Source/UI/Window/UIPetEvolutionWnd.h, Source/UI/Window/UIRPImageWnd.h, Source/UI/Window/UIRPImageWnd2.h, Source/UI/Window/UIRebirthWnd.h, Source/UI/Window/UIResizer.h, Source/UI/Window/UIRoMapWnd.h, Source/UI/Window/UIRodexContentsWnd.h, Source/UI/Window/UISecondCostumeWnd.h, Source/UI/Window/UISeekPartyMBWnd.h, Source/UI/Window/UIShowWarpWnd.h, Source/UI/Window/UITransMenuWnd.h, Source/UI/Window/UIVideoWnd.h, Source/UI/Window/UIViewCameraInfoWnd.h, Source/UI/Window/UIWindow.h, Source/UI/Window/WindowDialogs.h. --- Source/UI/Buttons/UIBasicButton.h | 2 - Source/UI/Buttons/UIBitmapButton.h | 2 - Source/UI/Buttons/UIButton.h | 2 - Source/UI/Buttons/UICheckBox.h | 2 - Source/UI/Buttons/UISpriteButton.h | 2 - Source/UI/Buttons/UITextButton.h | 2 - Source/UI/Chat/UINewChatWnd.h | 2 +- Source/UI/Chat/UISubChatMiniWnd.h | 2 +- Source/UI/Dialogs/UIEditctrlWnd.cpp | 16 ++-- Source/UI/Dialogs/UIEditctrlWnd.h | 2 +- Source/UI/Dialogs/UIMemorialDunWnd.h | 2 +- Source/UI/Dialogs/UIMiniMapWnd.h | 2 +- Source/UI/Edit/UIEditCtrl.h | 4 - Source/UI/Gauges/UIPlayerGage.cpp | 4 +- Source/UI/Guild/UIAgitWnd.h | 2 +- Source/UI/Guild/UIGuildHelperWnd.h | 2 +- Source/UI/Guild/UIGuildWnd.cpp | 88 +++++++++++----------- Source/UI/Guild/UIGuildWnd.h | 16 ++-- Source/UI/Items/UIItemRepairWnd.cpp | 40 +++++----- Source/UI/Items/UIItemRepairWnd.h | 2 +- Source/UI/Items/UIMakeTargetListWnd.h | 2 +- Source/UI/Items/UIMakeTargetProcessWnd.h | 2 +- Source/UI/Items/UIMakeTargetResultWnd.h | 2 +- Source/UI/Items/UIWeaponRefineWnd.h | 2 +- Source/UI/Lists/UIComboBoxDefWnd.h | 2 - Source/UI/Lists/UIListBox.h | 2 - Source/UI/Lists/UIListBoxNavi.h | 2 - Source/UI/Lists/UIScrollBar.h | 2 - Source/UI/Lists/UITabControl.h | 2 - Source/UI/Quest/UIQuestDisplay.cpp | 2 +- Source/UI/Rodex/UIRodexComposeWnd.h | 2 - Source/UI/Shortcuts/ShortcutControls.cpp | 6 +- Source/UI/Shortcuts/ShortcutControls.h | 3 +- Source/UI/Shortcuts/UIShortCutWnd.cpp | 20 ++--- Source/UI/Shortcuts/UIShortCutWnd.h | 2 +- Source/UI/Text/UIStaticText.h | 2 - Source/UI/Text/UIStaticText_LF.h | 2 - Source/UI/Text/UITextViewer.h | 2 - Source/UI/UIScrollWnd.h | 4 +- Source/UI/Window/UIEmblemWnd.cpp | 2 +- Source/UI/Window/UIEmblemWnd.h | 1 - Source/UI/Window/UIEscOptionWnd.cpp | 6 +- Source/UI/Window/UIEscOptionWnd.h | 2 +- Source/UI/Window/UIFrameWnd.h | 2 - Source/UI/Window/UIJobListWnd.cpp | 10 +-- Source/UI/Window/UIJobListWnd.h | 2 +- Source/UI/Window/UIMessageBox.h | 2 - Source/UI/Window/UIMileageWnd.cpp | 4 +- Source/UI/Window/UIMileageWnd.h | 2 +- Source/UI/Window/UIMiniBtnWnd.cpp | 2 +- Source/UI/Window/UIMiniBtnWnd.h | 2 +- Source/UI/Window/UINavigationHelpWnd.cpp | 6 +- Source/UI/Window/UINavigationHelpWnd.h | 2 +- Source/UI/Window/UINewSkillListWnd.cpp | 18 ++--- Source/UI/Window/UINewSkillListWnd.h | 2 +- Source/UI/Window/UINoteWnd.cpp | 10 +-- Source/UI/Window/UINoteWnd.h | 4 +- Source/UI/Window/UIOpenMailBoxWnd.cpp | 6 +- Source/UI/Window/UIOpenMailBoxWnd.h | 2 +- Source/UI/Window/UIOpenRoulletteWnd.cpp | 6 +- Source/UI/Window/UIOpenRoulletteWnd.h | 2 +- Source/UI/Window/UIPartyBookingHelpWnd.cpp | 6 +- Source/UI/Window/UIPartyBookingHelpWnd.h | 2 +- Source/UI/Window/UIPetEvolutionWnd.cpp | 12 +-- Source/UI/Window/UIPetEvolutionWnd.h | 2 +- Source/UI/Window/UIRPImageWnd.cpp | 4 +- Source/UI/Window/UIRPImageWnd.h | 2 +- Source/UI/Window/UIRPImageWnd2.cpp | 2 +- Source/UI/Window/UIRPImageWnd2.h | 2 +- Source/UI/Window/UIRebirthWnd.cpp | 4 +- Source/UI/Window/UIRebirthWnd.h | 2 +- Source/UI/Window/UIResizer.h | 2 - Source/UI/Window/UIRoMapWnd.cpp | 2 +- Source/UI/Window/UIRoMapWnd.h | 2 +- Source/UI/Window/UIRodexContentsWnd.cpp | 16 ++-- Source/UI/Window/UIRodexContentsWnd.h | 2 +- Source/UI/Window/UISecondCostumeWnd.cpp | 12 +-- Source/UI/Window/UISecondCostumeWnd.h | 2 +- Source/UI/Window/UISeekPartyMBWnd.cpp | 28 +++---- Source/UI/Window/UISeekPartyMBWnd.h | 2 +- Source/UI/Window/UIShowWarpWnd.cpp | 8 +- Source/UI/Window/UIShowWarpWnd.h | 2 +- Source/UI/Window/UITransMenuWnd.cpp | 2 +- Source/UI/Window/UITransMenuWnd.h | 2 +- Source/UI/Window/UIVideoWnd.cpp | 8 +- Source/UI/Window/UIVideoWnd.h | 4 +- Source/UI/Window/UIViewCameraInfoWnd.cpp | 2 +- Source/UI/Window/UIViewCameraInfoWnd.h | 2 +- Source/UI/Window/UIWindow.h | 8 +- Source/UI/Window/WindowDialogs.cpp | 4 +- Source/UI/Window/WindowDialogs.h | 2 - 91 files changed, 224 insertions(+), 280 deletions(-) diff --git a/Source/UI/Buttons/UIBasicButton.h b/Source/UI/Buttons/UIBasicButton.h index 28bee48b..6d57e939 100644 --- a/Source/UI/Buttons/UIBasicButton.h +++ b/Source/UI/Buttons/UIBasicButton.h @@ -6,8 +6,6 @@ class UIBasicButton : public UIButton { public: UIBasicButton(); - UIBasicButton(UIWindowContext&) : UIBasicButton() { - } ~UIBasicButton() override; void Paint() override; bool Configure(int width, const char* value); diff --git a/Source/UI/Buttons/UIBitmapButton.h b/Source/UI/Buttons/UIBitmapButton.h index 4037d89b..3ebb4798 100644 --- a/Source/UI/Buttons/UIBitmapButton.h +++ b/Source/UI/Buttons/UIBitmapButton.h @@ -9,8 +9,6 @@ class UIBitmapButton : public UIButton { public: UIBitmapButton(); - UIBitmapButton(UIWindowContext&) : UIBitmapButton() { - } ~UIBitmapButton() override; void Paint() override; bool SetBitmap(const char* name, int state, unsigned char exactSize); diff --git a/Source/UI/Buttons/UIButton.h b/Source/UI/Buttons/UIButton.h index bfdf62db..441f051d 100644 --- a/Source/UI/Buttons/UIButton.h +++ b/Source/UI/Buttons/UIButton.h @@ -31,8 +31,6 @@ class UIButton : public UIWindow { public: UIButton(); - UIButton(UIWindowContext&) : UIButton() { - } ~UIButton() override; void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Buttons/UICheckBox.h b/Source/UI/Buttons/UICheckBox.h index be9b32cf..6c604ab3 100644 --- a/Source/UI/Buttons/UICheckBox.h +++ b/Source/UI/Buttons/UICheckBox.h @@ -15,8 +15,6 @@ class UICheckBox : public UIWindow { public: UICheckBox(); - UICheckBox(UIWindowContext&) : UICheckBox() { - } ~UICheckBox() override; void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Buttons/UISpriteButton.h b/Source/UI/Buttons/UISpriteButton.h index 33898200..286d3f26 100644 --- a/Source/UI/Buttons/UISpriteButton.h +++ b/Source/UI/Buttons/UISpriteButton.h @@ -8,8 +8,6 @@ class UISpriteButton : public UIButton { public: UISpriteButton(); - UISpriteButton(UIWindowContext&) : UISpriteButton() { - } ~UISpriteButton() override; void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Buttons/UITextButton.h b/Source/UI/Buttons/UITextButton.h index 5d1a137a..a564e0d2 100644 --- a/Source/UI/Buttons/UITextButton.h +++ b/Source/UI/Buttons/UITextButton.h @@ -31,8 +31,6 @@ public: friend void OpenTextButtonNavigation(UITextButton* button); UITextButton(); - UITextButton(UIWindowContext&) : UITextButton() { - } ~UITextButton() override; void Paint() override; void Slot27(int x, int y) override; diff --git a/Source/UI/Chat/UINewChatWnd.h b/Source/UI/Chat/UINewChatWnd.h index ee0f20b4..edf9d9f8 100644 --- a/Source/UI/Chat/UINewChatWnd.h +++ b/Source/UI/Chat/UINewChatWnd.h @@ -15,7 +15,7 @@ extern std::uint8_t g_chatInputFlag; class UINewChatWnd : public UIFrameWnd { public: - UINewChatWnd(UIWindowContext& windows); + UINewChatWnd(); static void SaveChatWndInfo(); diff --git a/Source/UI/Chat/UISubChatMiniWnd.h b/Source/UI/Chat/UISubChatMiniWnd.h index 42b9f587..b8d68f1b 100644 --- a/Source/UI/Chat/UISubChatMiniWnd.h +++ b/Source/UI/Chat/UISubChatMiniWnd.h @@ -5,7 +5,7 @@ class UISubChatMiniWnd : public UIFrameWnd { public: - UISubChatMiniWnd(UIWindowContext& windows); + UISubChatMiniWnd(); void Slot15(int width, int height) override; void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Dialogs/UIEditctrlWnd.cpp b/Source/UI/Dialogs/UIEditctrlWnd.cpp index 95e2b234..c6fed73d 100644 --- a/Source/UI/Dialogs/UIEditctrlWnd.cpp +++ b/Source/UI/Dialogs/UIEditctrlWnd.cpp @@ -43,14 +43,14 @@ const char* g_miniMapMemoLineFormat = "%d\t%d\t%s\r\n"; // OFFSET: 0x0099B0C0 // FUNCTION: fn_13549 -UIEditctrlWnd::UIEditctrlWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIEditctrlWnd::UIEditctrlWnd() + : UIFrameWnd(0) { } // OFFSET: 0x0099B120 // FUNCTION: fn_13550 -UIMiniMapWnd::UIMiniMapWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIMiniMapWnd::UIMiniMapWnd() + : UIFrameWnd(0) { this->dragging = 0; this->unknown_0114 = 0; this->unknown_011C = nullptr; @@ -75,7 +75,7 @@ void UIMiniMapWnd::AddTownMarks() { mark.y = static_cast(this->originY - (static_cast(info.y) * this->scale + 6.0f)); this->warpMarks.push_back(mark); } else { - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); button->SetBitmap(info.image.c_str(), 0, 0); button->SetBitmap(info.image.c_str(), 1, 0); button->SetBitmap(info.image.c_str(), 2, 0); @@ -156,7 +156,7 @@ void UIEditctrlWnd::Slot15(int, int) { this->AddCloseButton(LookupMessage(2741), 0); this->AddNumberedButton(184, 205, 19, "minimap\\memo_ok", LookupMessage(2754), true); - this->edit = new UIEditCtrl(*this->m_context); + this->edit = new UIEditCtrl(); this->edit->SetSize(200, 18); this->edit->Move(5, 19); this->edit->maximum = 20; @@ -201,7 +201,7 @@ void UIMiniMapWnd::Slot15(int width, int height) { } this->LoadMemos(); - this->m_playerHead = new UIHeadsprButton(*this->m_context); + this->m_playerHead = new UIHeadsprButton(); this->UpdatePlayerHead(); this->m_playerHead->Move(-100, -100); this->m_playerHead->unknown_00BC = 0; @@ -502,7 +502,7 @@ int UIMiniMapWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argument1 case 485: { const int id = static_cast(this->questButtons.size()) + 2001; const std::string name = FormatOwnedString("유저인터페이스\\minimap\\Quest_%d_%d.bmp", argument1, argument2); - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); button->SetBitmap(name.c_str(), 0, 0); button->SetBitmap(name.c_str(), 1, 0); button->SetBitmap(name.c_str(), 2, 0); diff --git a/Source/UI/Dialogs/UIEditctrlWnd.h b/Source/UI/Dialogs/UIEditctrlWnd.h index 1034589f..367d02a6 100644 --- a/Source/UI/Dialogs/UIEditctrlWnd.h +++ b/Source/UI/Dialogs/UIEditctrlWnd.h @@ -7,7 +7,7 @@ class UIEditCtrl; class UIEditctrlWnd : public UIFrameWnd { public: - UIEditctrlWnd(UIWindowContext& windows); + UIEditctrlWnd(); 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/Dialogs/UIMemorialDunWnd.h b/Source/UI/Dialogs/UIMemorialDunWnd.h index 43c98982..1dacea62 100644 --- a/Source/UI/Dialogs/UIMemorialDunWnd.h +++ b/Source/UI/Dialogs/UIMemorialDunWnd.h @@ -11,7 +11,7 @@ extern int g_memorialDunWndY; class UIMemorialDunWnd : public UIFrameWnd { public: - UIMemorialDunWnd(UIWindowContext& windows); + UIMemorialDunWnd(); void Move(int x, int y) override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/Dialogs/UIMiniMapWnd.h b/Source/UI/Dialogs/UIMiniMapWnd.h index 7eada2f4..1ca017ff 100644 --- a/Source/UI/Dialogs/UIMiniMapWnd.h +++ b/Source/UI/Dialogs/UIMiniMapWnd.h @@ -19,7 +19,7 @@ struct MiniMapMark { class UIMiniMapWnd : public UIFrameWnd { public: - UIMiniMapWnd(UIWindowContext& windows); + UIMiniMapWnd(); void Slot11() override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/Edit/UIEditCtrl.h b/Source/UI/Edit/UIEditCtrl.h index 6ad9cdf0..ae4c8761 100644 --- a/Source/UI/Edit/UIEditCtrl.h +++ b/Source/UI/Edit/UIEditCtrl.h @@ -22,8 +22,6 @@ class UIEditCtrl : public UIWindow { public: UIEditCtrl(); - UIEditCtrl(UIWindowContext&) : UIEditCtrl() { - } UIEditCtrl(const UIEditCtrl& other); ~UIEditCtrl() override; bool Slot05() override; @@ -109,8 +107,6 @@ public: class UIEditCtrl3 : public UIEditCtrl2 { public: UIEditCtrl3(); - UIEditCtrl3(UIWindowContext&) : UIEditCtrl3() { - } UIEditCtrl3(const UIEditCtrl3& other); ~UIEditCtrl3() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Gauges/UIPlayerGage.cpp b/Source/UI/Gauges/UIPlayerGage.cpp index c2b34585..79cc1924 100644 --- a/Source/UI/Gauges/UIPlayerGage.cpp +++ b/Source/UI/Gauges/UIPlayerGage.cpp @@ -3,7 +3,7 @@ // OFFSET: 0x0086D2D0 // FUNCTION: fn_11044 UIGage::UIGage() : UIWindow(0) { - this->m_context = reinterpret_cast(0x009B1914); + this->unknown_007C = 0x009B1914; this->colors[0] = 0x00444444; this->colors[1] = 0x0025EA16; this->colors[2] = 0x00DB651D; @@ -31,7 +31,7 @@ UIPlayerGage::UIPlayerGage() : unknown_009C(0) { // OFFSET: 0x0086DE90 // FUNCTION: fn_11061 UIMonsterGage::UIMonsterGage() : m_threshold(0x19) { - this->m_context = reinterpret_cast(0x009C1810); + this->unknown_007C = 0x009C1810; this->colors[0] = 0x00424142; this->colors[1] = 0x00E700FF; this->colors[3] = 0x0000FFFF; diff --git a/Source/UI/Guild/UIAgitWnd.h b/Source/UI/Guild/UIAgitWnd.h index a6c8d0b5..037f33f6 100644 --- a/Source/UI/Guild/UIAgitWnd.h +++ b/Source/UI/Guild/UIAgitWnd.h @@ -34,7 +34,7 @@ public: class UIListBoxAgitMenu : public UIListBox { public: - UIListBoxAgitMenu(UIWindowContext& windows); + UIListBoxAgitMenu(); 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; void Slot25(int x, int y) override; diff --git a/Source/UI/Guild/UIGuildHelperWnd.h b/Source/UI/Guild/UIGuildHelperWnd.h index 0d328ce5..d1432b9c 100644 --- a/Source/UI/Guild/UIGuildHelperWnd.h +++ b/Source/UI/Guild/UIGuildHelperWnd.h @@ -50,7 +50,7 @@ protected: class UIGuildTipWnd : public UIFrameWnd { public: - UIGuildTipWnd(UIWindowContext& windows); + UIGuildTipWnd(); 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/Guild/UIGuildWnd.cpp b/Source/UI/Guild/UIGuildWnd.cpp index ba864520..2924efdb 100644 --- a/Source/UI/Guild/UIGuildWnd.cpp +++ b/Source/UI/Guild/UIGuildWnd.cpp @@ -290,24 +290,24 @@ void UIGuildTotalInfoWnd::Slot35(int delta) { // OFFSET: 0x00954020 // FUNCTION: fn_13005 -UIGuildWnd::UIGuildWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_saved(nullptr), m_tabs{} {} +UIGuildWnd::UIGuildWnd() + : UIFrameWnd(0), m_saved(nullptr), m_tabs{} {} // OFFSET: 0x00953900 // FUNCTION: fn_12995 -UIGuildBanishedMemberWnd::UIGuildBanishedMemberWnd(UIWindowContext& windows) - : UIGuildWnd(windows) { +UIGuildBanishedMemberWnd::UIGuildBanishedMemberWnd() + : UIGuildWnd() { } // OFFSET: 0x009539C0 // FUNCTION: fn_12997 -UIGuildInfoManageWnd::UIGuildInfoManageWnd(UIWindowContext& windows) - : UIGuildWnd(windows), unknown_00D8(), unknown_00E0(), unknown_00EC(0), unknown_00F0(0), m_guildId(g_guildInfo.m_guildId) { +UIGuildInfoManageWnd::UIGuildInfoManageWnd() + : UIGuildWnd(), unknown_00D8(), unknown_00E0(), unknown_00EC(0), unknown_00F0(0), m_guildId(g_guildInfo.m_guildId) { } // OFFSET: 0x00953B00 // FUNCTION: fn_12999 -UIGuildMemberManageWnd::UIGuildMemberManageWnd(UIWindowContext& windows) - : UIGuildWnd(windows), unknown_0150(), m_scrollTop(0), m_hoverRow(10), m_columns(1), m_visibleRows(6), unknown_016C(0), +UIGuildMemberManageWnd::UIGuildMemberManageWnd() + : UIGuildWnd(), unknown_0150(), m_scrollTop(0), m_hoverRow(10), m_columns(1), m_visibleRows(6), unknown_016C(0), m_scrollable(0), m_rowSpacing(0), m_members(), unknown_0180(), m_sortOrders() { this->m_buttonTime = 0; this->m_scrollBar = nullptr; @@ -323,13 +323,13 @@ UIGuildMemberManageWnd::UIGuildMemberManageWnd(UIWindowContext& windows) // OFFSET: 0x00953D10 // FUNCTION: fn_13000 -UIGuildNoticeWnd::UIGuildNoticeWnd(UIWindowContext& windows) : UIGuildWnd(windows) { +UIGuildNoticeWnd::UIGuildNoticeWnd() : UIGuildWnd() { } // OFFSET: 0x00953D70 // FUNCTION: fn_13001 -UIGuildPositionManageWnd::UIGuildPositionManageWnd(UIWindowContext& windows) - : UIGuildWnd(windows), m_buttonTime(0) { +UIGuildPositionManageWnd::UIGuildPositionManageWnd() + : UIGuildWnd(), m_buttonTime(0) { for (int index = 0; index < 11; ++index) { this->unknown_00D0[index] = 0; this->unknown_00FC[index] = 0; @@ -343,7 +343,7 @@ UIGuildPositionManageWnd::UIGuildPositionManageWnd(UIWindowContext& windows) // OFFSET: 0x00953E80 // FUNCTION: fn_13002 -UIGuildSkillWnd::UIGuildSkillWnd(UIWindowContext& windows) : UIGuildWnd(windows) { +UIGuildSkillWnd::UIGuildSkillWnd() : UIGuildWnd() { this->m_actionButtons[0] = nullptr; this->m_actionButtons[1] = nullptr; this->m_hoverIndex = -1; @@ -634,7 +634,7 @@ __declspec(noinline) void UIGuildWnd::CreateTabs() { const char** name = names; UIStaticText** tab = this->m_tabs; for (int x = 3; x < 399; x += 66) { - *tab = new UIStaticText(*this->m_context); + *tab = new UIStaticText(); (*tab)->SetSize(62, 15); (*tab)->SetTextFitted(*name); (*tab)->Move(x, 22); @@ -929,12 +929,12 @@ void UIGuildTotalInfoWnd::Slot15(int, int) { this->m_columns = 1; this->m_visibleRows = 12; this->m_scrollable = 0; - this->m_scrollBar = new UIScrollBar(*this->m_context); + this->m_scrollBar = new UIScrollBar(); this->m_scrollBar->Configure(this->geometry.width - 15, 63, 1, this->geometry.height - 87); this->AddChild(this->m_scrollBar); for (int index = 0; index < 12; ++index) { - this->m_rows[index] = new UIStaticText(*this->m_context); + this->m_rows[index] = new UIStaticText(); this->m_rows[index]->SetSize(g_guildBanishedColumnWidths[0] - 4, 15); this->m_rows[index]->SetTextFitted(""); this->m_rows[index]->Move(8, index * g_guildTotalInfoRowHeight + 63); @@ -959,18 +959,18 @@ void UIGuildBanishedMemberWnd::Slot15(int, int) { this->m_columns = 1; this->m_visibleRows = 11; this->m_scrollable = 0; - this->m_scrollBar = new UIScrollBar(*this->m_context); + this->m_scrollBar = new UIScrollBar(); this->m_scrollBar->Configure(this->geometry.width - 15, 63, 1, this->geometry.height - 87); this->AddChild(this->m_scrollBar); for (int index = 0; index < 11; ++index) { - this->m_names[index] = new UIStaticText(*this->m_context); + this->m_names[index] = new UIStaticText(); this->m_names[index]->SetSize(g_guildBanishedColumnWidths[0] - 4, 15); this->m_names[index]->SetTextFitted(""); this->m_names[index]->Move(8, index * g_guildBanishedRowHeight + 63); this->AddChild(this->m_names[index]); - this->m_reasons[index] = new UIStaticText(*this->m_context); + this->m_reasons[index] = new UIStaticText(); this->m_reasons[index]->SetSize(g_guildBanishedColumnWidths[1] - 4, 15); this->m_reasons[index]->SetTextFitted(""); this->m_reasons[index]->Move(g_guildMemberColumnWidths[0] + 58, index * g_guildBanishedRowHeight + 63); @@ -999,7 +999,7 @@ void UIGuildInfoManageWnd::Slot15(int, int) { { const std::string prefix("유저인터페이스\\"); - this->m_editButton = new UIBitmapButton(*this->m_context); + this->m_editButton = new UIBitmapButton(); this->m_editButton->SetBitmap((prefix + "btn_edit" + ".bmp").c_str(), 0, 0); this->m_editButton->SetBitmap((prefix + "btn_edit_a" + ".bmp").c_str(), 1, 0); this->m_editButton->SetBitmap((prefix + "btn_edit_b" + ".bmp").c_str(), 2, 0); @@ -1012,7 +1012,7 @@ void UIGuildInfoManageWnd::Slot15(int, int) { this->m_editButton->SetId(278); this->AddChild(this->m_editButton); - this->m_disbandButton = new UIBitmapButton(*this->m_context); + this->m_disbandButton = new UIBitmapButton(); this->m_disbandButton->SetBitmap("유저인터페이스\\btn_disBand.bmp", 0, 0); this->m_disbandButton->SetBitmap("유저인터페이스\\btn_disBand_a.bmp", 1, 0); this->m_disbandButton->SetBitmap("유저인터페이스\\btn_disBand_b.bmp", 2, 0); @@ -1026,14 +1026,14 @@ void UIGuildInfoManageWnd::Slot15(int, int) { this->AddChild(this->m_disbandButton); } - this->m_agitList = new UIListBoxAgit(*this->m_context); + this->m_agitList = new UIListBoxAgit(); this->m_agitList->SetSize(95, 158); this->m_agitList->Move(this->TextWidth(LookupMessage(333), 0, 0, 12, 0, 0) + 19, 129); this->m_agitList->lineHeight = 13; this->m_agitList->SetId(558); this->AddChild(this->m_agitList); - this->m_agitMenu = new UIListBoxAgitMenu(*this->m_context); + this->m_agitMenu = new UIListBoxAgitMenu(); this->m_agitMenu->SetSize(120, 35); this->m_agitMenu->SetId(559); this->m_agitMenu->Show(0); @@ -1718,25 +1718,25 @@ void UIGuildMemberManageWnd::Slot15(int, int) { this->m_rowSpacing += 8; for (int row = 0; row < 6; ++row) { - this->m_rowTexts[1][row] = new UIStaticText(*this->m_context); + this->m_rowTexts[1][row] = new UIStaticText(); this->m_rowTexts[1][row]->SetSize(g_guildMemberColumnWidths[0] / 2 + 2, 15); this->m_rowTexts[1][row]->SetTextFitted(""); this->m_rowTexts[1][row]->Move(8, (this->m_rowSpacing + 36) * row + 63); this->AddChild(this->m_rowTexts[1][row]); - this->m_rowTexts[2][row] = new UIStaticText(*this->m_context); + this->m_rowTexts[2][row] = new UIStaticText(); this->m_rowTexts[2][row]->SetSize(g_guildMemberColumnWidths[1] - 16, 15); this->m_rowTexts[2][row]->SetTextFitted(""); this->m_rowTexts[2][row]->Move(g_guildMemberColumnWidths[0] + 8, (this->m_rowSpacing + 36) * row + 63); this->AddChild(this->m_rowTexts[2][row]); - this->m_rowTexts[3][row] = new UIStaticText(*this->m_context); + this->m_rowTexts[3][row] = new UIStaticText(); this->m_rowTexts[3][row]->SetSize(39, 15); this->m_rowTexts[3][row]->SetTextFitted(""); this->m_rowTexts[3][row]->Move(g_guildMemberColumnWidths[0] + 58, (this->m_rowSpacing + 36) * row + 63); this->AddChild(this->m_rowTexts[3][row]); - this->m_rowTexts[0][row] = new UIStaticText(*this->m_context); + this->m_rowTexts[0][row] = new UIStaticText(); this->m_rowTexts[0][row]->SetSize(39, 15); this->m_rowTexts[0][row]->SetTextFitted(""); this->m_rowTexts[0][row]->Move(g_guildMemberColumnWidths[0] + 101, (this->m_rowSpacing + 36) * row + 63); @@ -1747,7 +1747,7 @@ void UIGuildMemberManageWnd::Slot15(int, int) { const std::string prefix("유저인터페이스\\basic_interface\\"); UIBitmapButton** button = this->m_rowButtons; for (int y = 82; y < 298; y += 36, ++button) { - *button = new UIBitmapButton(*this->m_context); + *button = new UIBitmapButton(); (*button)->SetBitmap((prefix + "txtbox_btn_a" + ".bmp").c_str(), 0, 0); (*button)->SetBitmap((prefix + "txtbox_btn_b" + ".bmp").c_str(), 1, 0); (*button)->SetBitmap((prefix + "txtbox_btn_c" + ".bmp").c_str(), 2, 0); @@ -1758,7 +1758,7 @@ void UIGuildMemberManageWnd::Slot15(int, int) { } } - this->m_scrollBar = new UIScrollBar(*this->m_context); + this->m_scrollBar = new UIScrollBar(); this->m_scrollBar->Configure(this->geometry.width - 16, 43, 1, this->m_rowSpacing + 241); this->AddChild(this->m_scrollBar); @@ -1766,7 +1766,7 @@ void UIGuildMemberManageWnd::Slot15(int, int) { const std::string prefix("유저인터페이스\\"); int x = this->geometry.width - 61; int y = this->geometry.height - 23; - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); this->m_button = button; button->SetBitmap((prefix + "btn_ok" + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + "btn_ok_a" + ".bmp").c_str(), 1, 0); @@ -1783,7 +1783,7 @@ void UIGuildMemberManageWnd::Slot15(int, int) { this->m_message0 = 184; } - this->m_onlineCheck = new UICheckBox(*this->m_context); + this->m_onlineCheck = new UICheckBox(); this->m_onlineCheck->SetSize(240, 12); this->m_onlineCheck->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", LookupMessage(2864)); this->m_onlineCheck->FitToText(); @@ -2018,7 +2018,7 @@ void UIGuildNoticeWnd::Slot15(int, int) { g_windowMgr.SetFocus(this->m_titleEdit); this->m_titleEdit->SetText(g_guildInfo.unknown_0030.c_str()); - this->m_bodyEdit = new UIEditCtrl3(*this->m_context); + this->m_bodyEdit = new UIEditCtrl3(); this->m_bodyEdit->SetSize(this->geometry.width - 10, 156); this->m_bodyEdit->invalidatesParent = 1; this->m_bodyEdit->Move(5, 104); @@ -2028,7 +2028,7 @@ void UIGuildNoticeWnd::Slot15(int, int) { this->m_bodyEdit->SetText(g_guildInfo.unknown_0048.c_str()); const std::string prefix("유저인터페이스\\"); - this->m_sendButton = new UIBitmapButton(*this->m_context); + this->m_sendButton = new UIBitmapButton(); this->m_sendButton->SetBitmap((prefix + "btn_send" + ".bmp").c_str(), 0, 0); this->m_sendButton->SetBitmap((prefix + "btn_send_a" + ".bmp").c_str(), 1, 0); this->m_sendButton->SetBitmap((prefix + "btn_send_b" + ".bmp").c_str(), 2, 0); @@ -2243,19 +2243,19 @@ int UIGuildSkillWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a1, st // OFFSET: 0x00953F60 // FUNCTION: fn_13003 -UIGuildTipWnd::UIGuildTipWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIGuildTipWnd::UIGuildTipWnd() + : UIFrameWnd(0) { } // OFFSET: 0x00953FC0 // FUNCTION: fn_13004 -UIGuildTotalInfoWnd::UIGuildTotalInfoWnd(UIWindowContext& windows) - : UIGuildWnd(windows) { +UIGuildTotalInfoWnd::UIGuildTotalInfoWnd() + : UIGuildWnd() { } // OFFSET: 0x00954120 // FUNCTION: fn_13006 -UIListBoxAgitMenu::UIListBoxAgitMenu(UIWindowContext& windows) : UIListBox(windows) { +UIListBoxAgitMenu::UIListBoxAgitMenu() : UIListBox() { } // OFFSET: 0x0095BF90 @@ -2268,7 +2268,7 @@ void UIGuildSkillWnd::Slot15(int, int height) { g_guildInfo.unknown_00C8 = 1; g_modeMgr.gameMode->SendMsg(107, 3, 0, 0, 0); - this->m_scrollBar = new UIScrollBar(*this->m_context); + this->m_scrollBar = new UIScrollBar(); this->m_scrollBar->Configure(this->geometry.width - 15, 41, 1, this->geometry.height - 70); this->AddChild(this->m_scrollBar); this->m_columns = 1; @@ -2282,7 +2282,7 @@ void UIGuildSkillWnd::Slot15(int, int height) { UIBitmapButton** button = this->m_levelUpButtons; int* id = ids; for (int y = 45; y < 283; y += 34, ++button, ++id) { - *button = new UIBitmapButton(*this->m_context); + *button = new UIBitmapButton(); (*button)->SetBitmap(normal.c_str(), 0, 0); (*button)->SetBitmap(hover.c_str(), 1, 0); (*button)->SetBitmap(pressed.c_str(), 2, 0); @@ -2299,7 +2299,7 @@ void UIGuildSkillWnd::Slot15(int, int height) { UIBitmapButton** button = this->m_previousButtons; int* id = ids; for (int y = 58; y < 296; y += 34, ++button, ++id) { - *button = new UIBitmapButton(*this->m_context); + *button = new UIBitmapButton(); (*button)->SetBitmap(bitmap.c_str(), 0, 0); (*button)->SetBitmap(bitmap.c_str(), 1, 0); (*button)->SetBitmap(bitmap.c_str(), 2, 0); @@ -2316,7 +2316,7 @@ void UIGuildSkillWnd::Slot15(int, int height) { UIBitmapButton** button = this->m_nextButtons; int* id = ids; for (int y = 58; y < 296; y += 34, ++button, ++id) { - *button = new UIBitmapButton(*this->m_context); + *button = new UIBitmapButton(); (*button)->SetBitmap(bitmap.c_str(), 0, 0); (*button)->SetBitmap(bitmap.c_str(), 1, 0); (*button)->SetBitmap(bitmap.c_str(), 2, 0); @@ -2340,7 +2340,7 @@ void UIGuildSkillWnd::Slot15(int, int height) { }; UIBitmapButton** button = this->m_actionButtons; for (int index = 0; index < 2; ++index, ++button) { - *button = new UIBitmapButton(*this->m_context); + *button = new UIBitmapButton(); (*button)->SetBitmap((prefix + names[index][0] + ".bmp").c_str(), 0, 0); (*button)->SetBitmap((prefix + names[index][1] + ".bmp").c_str(), 1, 0); (*button)->SetBitmap((prefix + names[index][2] + ".bmp").c_str(), 2, 0); @@ -2854,7 +2854,7 @@ int UIGuildMemberManageWnd::SendMsg(UIWindow* sender, int message, std::intptr_t this->m_rowButtons[index]->Enable(enabled); } else { const std::string prefix("유저인터페이스\\basic_interface\\"); - this->m_rowButtons[index] = new UIBitmapButton(*this->m_context); + this->m_rowButtons[index] = new UIBitmapButton(); this->m_rowButtons[index]->SetBitmap((prefix + "txtbox_btn_a" + ".bmp").c_str(), 0, 0); this->m_rowButtons[index]->SetBitmap((prefix + "txtbox_btn_b" + ".bmp").c_str(), 1, 0); this->m_rowButtons[index]->SetBitmap((prefix + "txtbox_btn_c" + ".bmp").c_str(), 2, 0); @@ -2899,7 +2899,7 @@ void UIGuildPositionManageWnd::Slot15(int, int) { this->m_columns = 1; this->m_visibleRows = 11; this->m_scrollable = 0; - this->m_scrollBar = new UIScrollBar(*this->m_context); + this->m_scrollBar = new UIScrollBar(); this->m_scrollBar->Configure(this->geometry.width - 15, 41, 1, this->geometry.height - 70); this->AddChild(this->m_scrollBar); diff --git a/Source/UI/Guild/UIGuildWnd.h b/Source/UI/Guild/UIGuildWnd.h index 910de72b..90567c36 100644 --- a/Source/UI/Guild/UIGuildWnd.h +++ b/Source/UI/Guild/UIGuildWnd.h @@ -63,7 +63,7 @@ struct GuildWndNameEntry { class UIGuildWnd : public UIFrameWnd { public: - UIGuildWnd(UIWindowContext& windows); + UIGuildWnd(); void Slot11() override; void Paint() override; void Slot25(int x, int y) override; @@ -81,7 +81,7 @@ protected: class UIGuildBanishedMemberWnd : public UIGuildWnd { public: - UIGuildBanishedMemberWnd(UIWindowContext& windows); + UIGuildBanishedMemberWnd(); int Tab() override; void Slot15(int width, int height) override; void Paint() override; @@ -104,7 +104,7 @@ protected: class UIGuildInfoManageWnd : public UIGuildWnd { public: - UIGuildInfoManageWnd(UIWindowContext& windows); + UIGuildInfoManageWnd(); int Tab() override; void Slot15(int width, int height) override; void Slot19() override; @@ -134,7 +134,7 @@ protected: class UIGuildMemberManageWnd : public UIGuildWnd { public: - UIGuildMemberManageWnd(UIWindowContext& windows); + UIGuildMemberManageWnd(); int Tab() override; void Slot15(int width, int height) override; void Slot19() override; @@ -173,7 +173,7 @@ protected: class UIGuildNoticeWnd : public UIGuildWnd { public: - UIGuildNoticeWnd(UIWindowContext& windows); + UIGuildNoticeWnd(); void Slot15(int width, int height) override; void Paint() override; void Slot25(int x, int y) override; @@ -187,7 +187,7 @@ protected: class UIGuildPositionManageWnd : public UIGuildWnd { public: - UIGuildPositionManageWnd(UIWindowContext& windows); + UIGuildPositionManageWnd(); void Slot15(int width, int height) override; void Slot19() override; void Paint() override; @@ -223,7 +223,7 @@ protected: class UIGuildSkillWnd : public UIGuildWnd { public: - UIGuildSkillWnd(UIWindowContext& windows); + UIGuildSkillWnd(); int Tab() override; void Slot15(int width, int height) override; void Paint() override; @@ -257,7 +257,7 @@ protected: class UIGuildTotalInfoWnd : public UIGuildWnd { public: - UIGuildTotalInfoWnd(UIWindowContext& windows); + UIGuildTotalInfoWnd(); int Tab() override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/Items/UIItemRepairWnd.cpp b/Source/UI/Items/UIItemRepairWnd.cpp index 09e802a5..fe6bbd15 100644 --- a/Source/UI/Items/UIItemRepairWnd.cpp +++ b/Source/UI/Items/UIItemRepairWnd.cpp @@ -54,7 +54,7 @@ void UIMakeTargetResultWnd::Paint() { // OFFSET: 0x009A0B00 // FUNCTION: fn_13604 void UIItemRepairWnd::Slot15(int width, int height) { - this->m_list = new UIListBox(*this->m_context); + this->m_list = new UIListBox(); this->m_list->Configure(12, 22, width - 24, height - 55, 0); this->m_list->backgroundRed = 240; this->m_list->backgroundGreen = 240; @@ -68,7 +68,7 @@ void UIItemRepairWnd::Slot15(int width, int height) { int ids[2] = {184, 185}; for (int i = 0; i < 2; ++i) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + names[i][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[i][1] + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + names[i][2] + ".bmp").c_str(), 2, 0); @@ -84,7 +84,7 @@ void UIItemRepairWnd::Slot15(int width, int height) { // OFFSET: 0x009A1590 // FUNCTION: fn_13605 void UIMakeTargetListWnd::Slot15(int width, int height) { - this->m_list = new UIListBox(*this->m_context); + this->m_list = new UIListBox(); this->m_list->Configure(12, 22, width - 24, height - 55, 0); this->m_list->backgroundRed = 240; this->m_list->backgroundGreen = 240; @@ -98,7 +98,7 @@ void UIMakeTargetListWnd::Slot15(int width, int height) { int ids[2] = {184, 185}; for (int i = 0; i < 2; ++i) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + names[i][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[i][1] + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + names[i][2] + ".bmp").c_str(), 2, 0); @@ -120,7 +120,7 @@ void UIMakeTargetProcessWnd::Slot15(int width, int height) { int ids[2] = {184, 185}; for (int i = 0; i < 2; ++i) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + names[i][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[i][1] + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + names[i][2] + ".bmp").c_str(), 2, 0); @@ -138,7 +138,7 @@ void UIMakeTargetProcessWnd::Slot15(int width, int height) { void UIMakeTargetResultWnd::Slot15(int width, int height) { const std::string prefix("유저인터페이스\\"); - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + "btn_ok" + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + "btn_ok_a" + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + "btn_ok_b" + ".bmp").c_str(), 2, 0); @@ -153,7 +153,7 @@ void UIMakeTargetResultWnd::Slot15(int width, int height) { // OFFSET: 0x009A2DD0 // FUNCTION: fn_13608 void UIWeaponRefineWnd::Slot15(int width, int height) { - this->m_list = new UIListBox(*this->m_context); + this->m_list = new UIListBox(); this->m_list->Configure(12, 22, width - 24, height - 55, 0); this->m_list->backgroundRed = 240; this->m_list->backgroundGreen = 240; @@ -167,7 +167,7 @@ void UIWeaponRefineWnd::Slot15(int width, int height) { int ids[2] = {184, 185}; for (int i = 0; i < 2; ++i) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap((prefix + names[i][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[i][1] + ".bmp").c_str(), 1, 0); button->SetBitmap((prefix + names[i][2] + ".bmp").c_str(), 2, 0); @@ -305,41 +305,37 @@ int UIMakeTargetResultWnd::SendMsg(UIWindow* sender, int message, std::intptr_t // OFFSET: 0x0099F780 // FUNCTION: fn_13587 -UIItemRepairWnd::UIItemRepairWnd(UIWindowContext& windows, - WindowResponseRecorder& recorder) - : UIFrameWnd(windows, 0), itemIds(), indices(), entries() { +UIItemRepairWnd::UIItemRepairWnd(WindowResponseRecorder& recorder) + : UIFrameWnd(0), itemIds(), indices(), entries() { } // OFFSET: 0x0099F850 // FUNCTION: fn_13588 -UIMakeTargetListWnd::UIMakeTargetListWnd( - UIWindowContext& windows, WindowResponseRecorder& recorder +UIMakeTargetListWnd::UIMakeTargetListWnd(WindowResponseRecorder& recorder ) - : UIFrameWnd(windows, 0), itemIds() { + : UIFrameWnd(0), itemIds() { } // OFFSET: 0x0099F8D0 // FUNCTION: fn_13589 -UIMakeTargetProcessWnd::UIMakeTargetProcessWnd( - UIWindowContext& windows, WindowResponseRecorder& recorder +UIMakeTargetProcessWnd::UIMakeTargetProcessWnd(WindowResponseRecorder& recorder ) - : UIFrameWnd(windows, 0), materials() { + : UIFrameWnd(0), materials() { } // OFFSET: 0x0099F950 // FUNCTION: fn_13590 -UIMakeTargetResultWnd::UIMakeTargetResultWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIMakeTargetResultWnd::UIMakeTargetResultWnd() + : UIFrameWnd(0) { this->succeeded = false; this->makeType = 0; } // OFFSET: 0x0099F9C0 // FUNCTION: fn_13591 -UIWeaponRefineWnd::UIWeaponRefineWnd( - UIWindowContext& windows, WindowResponseRecorder& recorder +UIWeaponRefineWnd::UIWeaponRefineWnd(WindowResponseRecorder& recorder ) - : UIFrameWnd(windows, 0), itemIds(), indices() { + : UIFrameWnd(0), itemIds(), indices() { } // OFFSET: 0x0099FB70 diff --git a/Source/UI/Items/UIItemRepairWnd.h b/Source/UI/Items/UIItemRepairWnd.h index 523848b6..ff3da1b9 100644 --- a/Source/UI/Items/UIItemRepairWnd.h +++ b/Source/UI/Items/UIItemRepairWnd.h @@ -22,7 +22,7 @@ static_assert(sizeof(UIItemRepairEntry) == 0x18); class UIItemRepairWnd : public UIFrameWnd { public: - UIItemRepairWnd(UIWindowContext& windows, WindowResponseRecorder& recorder); + UIItemRepairWnd(WindowResponseRecorder& recorder); ~UIItemRepairWnd() override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/Items/UIMakeTargetListWnd.h b/Source/UI/Items/UIMakeTargetListWnd.h index 5d09ebbe..3ca78869 100644 --- a/Source/UI/Items/UIMakeTargetListWnd.h +++ b/Source/UI/Items/UIMakeTargetListWnd.h @@ -10,7 +10,7 @@ class UIListBox; class UIMakeTargetListWnd : public UIFrameWnd { public: - UIMakeTargetListWnd(UIWindowContext& windows, WindowResponseRecorder& recorder); + UIMakeTargetListWnd(WindowResponseRecorder& recorder); std::vector BuildReplayRecords(); void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/Items/UIMakeTargetProcessWnd.h b/Source/UI/Items/UIMakeTargetProcessWnd.h index aedcd578..1d933098 100644 --- a/Source/UI/Items/UIMakeTargetProcessWnd.h +++ b/Source/UI/Items/UIMakeTargetProcessWnd.h @@ -10,7 +10,7 @@ struct WindowResponseRecorder; class UIMakeTargetProcessWnd : public UIFrameWnd { public: - UIMakeTargetProcessWnd(UIWindowContext& windows, WindowResponseRecorder& recorder); + UIMakeTargetProcessWnd(WindowResponseRecorder& recorder); void Paint() override; void Slot10(int x, int y, std::intptr_t value) override; void Slot15(int width, int height) override; diff --git a/Source/UI/Items/UIMakeTargetResultWnd.h b/Source/UI/Items/UIMakeTargetResultWnd.h index 917c9605..80f8b1f2 100644 --- a/Source/UI/Items/UIMakeTargetResultWnd.h +++ b/Source/UI/Items/UIMakeTargetResultWnd.h @@ -6,7 +6,7 @@ class UIMakeTargetResultWnd : public UIFrameWnd { public: - UIMakeTargetResultWnd(UIWindowContext& windows); + UIMakeTargetResultWnd(); 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/Items/UIWeaponRefineWnd.h b/Source/UI/Items/UIWeaponRefineWnd.h index b993f92b..cfcb28a8 100644 --- a/Source/UI/Items/UIWeaponRefineWnd.h +++ b/Source/UI/Items/UIWeaponRefineWnd.h @@ -10,7 +10,7 @@ class UIListBox; class UIWeaponRefineWnd : public UIFrameWnd { public: - UIWeaponRefineWnd(UIWindowContext& windows, WindowResponseRecorder& recorder); + UIWeaponRefineWnd(WindowResponseRecorder& recorder); std::vector BuildReplayRecords(); void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/Lists/UIComboBoxDefWnd.h b/Source/UI/Lists/UIComboBoxDefWnd.h index 99f08d6b..f9cbe471 100644 --- a/Source/UI/Lists/UIComboBoxDefWnd.h +++ b/Source/UI/Lists/UIComboBoxDefWnd.h @@ -10,8 +10,6 @@ class UIStaticText; class UIComboBoxDefWnd : public UIWindow { public: UIComboBoxDefWnd(); - UIComboBoxDefWnd(UIWindowContext&) : UIComboBoxDefWnd() { - } ~UIComboBoxDefWnd() override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/Lists/UIListBox.h b/Source/UI/Lists/UIListBox.h index 6d67ac02..2e8b9a23 100644 --- a/Source/UI/Lists/UIListBox.h +++ b/Source/UI/Lists/UIListBox.h @@ -14,8 +14,6 @@ class UIScrollBar; class UIListBox : public UIWindow { public: __declspec(noinline) UIListBox(); - UIListBox(UIWindowContext&) : UIListBox() { - } ~UIListBox() override; void Resize(int width, int height) override; void Slot15(int width, int height) override; diff --git a/Source/UI/Lists/UIListBoxNavi.h b/Source/UI/Lists/UIListBoxNavi.h index 81bfe8ef..2ddfe9f0 100644 --- a/Source/UI/Lists/UIListBoxNavi.h +++ b/Source/UI/Lists/UIListBoxNavi.h @@ -9,8 +9,6 @@ class UIListBoxNavi : public UIListBox { public: UIListBoxNavi(); - UIListBoxNavi(UIWindowContext&) : UIListBoxNavi() { - } void Paint() override; void Slot25(int x, int y) override; void Clear() override; diff --git a/Source/UI/Lists/UIScrollBar.h b/Source/UI/Lists/UIScrollBar.h index 04357b9f..78cd853b 100644 --- a/Source/UI/Lists/UIScrollBar.h +++ b/Source/UI/Lists/UIScrollBar.h @@ -6,8 +6,6 @@ class UIScrollBar : public UIWindow { public: UIScrollBar(); - UIScrollBar(UIWindowContext&) : UIScrollBar() { - } ~UIScrollBar() override; void Resize(int width, int height) override; bool Slot08() override; diff --git a/Source/UI/Lists/UITabControl.h b/Source/UI/Lists/UITabControl.h index 29ae3141..cfa3280b 100644 --- a/Source/UI/Lists/UITabControl.h +++ b/Source/UI/Lists/UITabControl.h @@ -11,8 +11,6 @@ class UIEditCtrl; class UITabControl : public UIWindow { public: UITabControl(); - UITabControl(UIWindowContext&) : UITabControl() { - } int TabCount(); int TabAt(int x, int y); void FillTab(int index, int x, int y, int width, int height, std::uint32_t color); diff --git a/Source/UI/Quest/UIQuestDisplay.cpp b/Source/UI/Quest/UIQuestDisplay.cpp index f907a6a9..aa8c0915 100644 --- a/Source/UI/Quest/UIQuestDisplay.cpp +++ b/Source/UI/Quest/UIQuestDisplay.cpp @@ -56,7 +56,7 @@ void UIQuestDisplay::Paint() { const int top = single * 50 + (none + multiple * 2) * 40; std::string title = info.m_title.size() == 0 ? FormatOwnedString("Unknown Quest, ID = %d", questId) : info.m_title; - if (questId == reinterpret_cast(this->m_context)) { + if (questId == this->unknown_007C) { this->FillRegion(-12, top - 2, this->geometry.width - 10, 40, 0); } this->DrawShadowedText(0, top, title.c_str(), 0, 0xD6E1, 0, 0, 12, 0); diff --git a/Source/UI/Rodex/UIRodexComposeWnd.h b/Source/UI/Rodex/UIRodexComposeWnd.h index 757c9aaf..a4d099ba 100644 --- a/Source/UI/Rodex/UIRodexComposeWnd.h +++ b/Source/UI/Rodex/UIRodexComposeWnd.h @@ -26,8 +26,6 @@ public: class UIRodexEditCtrl3 : public UIEditCtrl3 { public: UIRodexEditCtrl3(); - UIRodexEditCtrl3(UIWindowContext&) : UIRodexEditCtrl3() { - } void Slot15(int width, int height) override; void sub_855150(); }; diff --git a/Source/UI/Shortcuts/ShortcutControls.cpp b/Source/UI/Shortcuts/ShortcutControls.cpp index 8bea7278..a7a738cc 100644 --- a/Source/UI/Shortcuts/ShortcutControls.cpp +++ b/Source/UI/Shortcuts/ShortcutControls.cpp @@ -11,7 +11,7 @@ // OFFSET: 0x0092A190 // FUNCTION: fn_12654 ShortcutControls ShortcutControls::Create( - UIFrameWnd& frame, UIWindowContext& windows, int bankOption, NormalItemSlot** slots, NormalItemSlot** itemSlots + UIFrameWnd& frame, int bankOption, NormalItemSlot** slots, NormalItemSlot** itemSlots ) { ShortcutControls result; frame.AddCloseButton("F12", 0)->Move(frame.geometry.width - 10, 0); @@ -20,7 +20,7 @@ ShortcutControls ShortcutControls::Create( slots[index] = nullptr; } - result.bank = new (std::nothrow) UICheckBox(windows); + result.bank = new (std::nothrow) UICheckBox(); result.bank->SetSize(10, 26); result.bank->SetImages( "유저인터페이스\\shortcut_2_bts.bmp", @@ -36,7 +36,7 @@ ShortcutControls ShortcutControls::Create( int id, int x, int y, unsigned char disabled, unsigned char enabled, const char* normal, const char* over, const char* pressed, const char* unavailable ) { - UIBitmapButton* button = new UIBitmapButton(windows); + UIBitmapButton* button = new UIBitmapButton(); button->SetBitmap(normal, 0, 0); button->SetBitmap(over, 1, 0); button->SetBitmap(pressed, 2, 0); diff --git a/Source/UI/Shortcuts/ShortcutControls.h b/Source/UI/Shortcuts/ShortcutControls.h index 353be867..be9c20d2 100644 --- a/Source/UI/Shortcuts/ShortcutControls.h +++ b/Source/UI/Shortcuts/ShortcutControls.h @@ -1,7 +1,6 @@ #ifndef RAGNAROK_SOURCE_UI_SHORTCUTS_SHORTCUTCONTROLS_H #define RAGNAROK_SOURCE_UI_SHORTCUTS_SHORTCUTCONTROLS_H -struct UIWindowContext; class UIFrameWnd; class UICheckBox; class UIBitmapButton; @@ -15,7 +14,7 @@ struct ShortcutControls { UIBitmapButton* hideItems; static ShortcutControls - Create(UIFrameWnd& frame, UIWindowContext& windows, int bankOption, NormalItemSlot** slots, NormalItemSlot** itemSlots); + Create(UIFrameWnd& frame, int bankOption, NormalItemSlot** slots, NormalItemSlot** itemSlots); }; #endif diff --git a/Source/UI/Shortcuts/UIShortCutWnd.cpp b/Source/UI/Shortcuts/UIShortCutWnd.cpp index 20375358..d188c57a 100644 --- a/Source/UI/Shortcuts/UIShortCutWnd.cpp +++ b/Source/UI/Shortcuts/UIShortCutWnd.cpp @@ -94,8 +94,8 @@ static bool g_subChatMiniSecondCollapsed; // OFFSET: 0x009122B0 // FUNCTION: fn_12528 -UIShortCutWnd::UIShortCutWnd(UIWindowContext& windows, ShortcutWindowContext& shortcuts) - : UIFrameWnd(windows, 0), m_shortcuts(&shortcuts) { +UIShortCutWnd::UIShortCutWnd(ShortcutWindowContext& shortcuts) + : UIFrameWnd(0), m_shortcuts(&shortcuts) { this->m_controls.decrease = nullptr; this->m_controls.increase = nullptr; } @@ -158,7 +158,7 @@ void UIShortCutWnd::Show(int visible) { // OFFSET: 0x0092A190 void UIShortCutWnd::Slot15(int, int) { this->m_controls = - ShortcutControls::Create(*this, *this->m_context, g_session.GetOption(10), this->m_slots, this->m_itemSlots); + ShortcutControls::Create(*this, g_session.GetOption(10), this->m_slots, this->m_itemSlots); } // OFFSET: 0x00932F30 @@ -804,7 +804,7 @@ void UIMemorialDunWnd::Slot15(int, int) { { const std::string name = "유저인터페이스\\btn_ok"; - this->m_actionButton = new UIBitmapButton(*this->m_context); + this->m_actionButton = new UIBitmapButton(); this->m_actionButton->SetBitmap((name + ".bmp").c_str(), 0, 0); this->m_actionButton->SetBitmap((name + "_a.bmp").c_str(), 1, 0); this->m_actionButton->SetBitmap((name + "_b.bmp").c_str(), 2, 0); @@ -814,7 +814,7 @@ void UIMemorialDunWnd::Slot15(int, int) { this->AddChild(this->m_actionButton); } - this->m_partyButton = new (std::nothrow) UIBasicButton(*this->m_context); + this->m_partyButton = new (std::nothrow) UIBasicButton(); this->m_partyButton->Configure(125, LookupMessage(3270)); this->m_partyButton->Move(-100, -100); this->m_partyButton->SetId(211); @@ -1174,19 +1174,19 @@ bool UINavigationWnd::LoadRoute(int index) { // OFFSET: 0x00911490 // FUNCTION: fn_12515 -UIMemorialDunWnd::UIMemorialDunWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_partyButton(nullptr) { +UIMemorialDunWnd::UIMemorialDunWnd() + : UIFrameWnd(0), m_partyButton(nullptr) { } // OFFSET: 0x00912460 // FUNCTION: fn_12530 -UISubChatMiniWnd::UISubChatMiniWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), unknown_00B4(2), m_rowHeight(32), m_offsetY(32) { +UISubChatMiniWnd::UISubChatMiniWnd() + : UIFrameWnd(0), unknown_00B4(2), m_rowHeight(32), m_offsetY(32) { } // OFFSET: 0x00911700 // FUNCTION: fn_12518 -UINewChatWnd::UINewChatWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UINewChatWnd::UINewChatWnd() : UIFrameWnd(0) { this->m_chatEdit = nullptr; this->unknown_00C0 = nullptr; this->m_inputEdit = nullptr; diff --git a/Source/UI/Shortcuts/UIShortCutWnd.h b/Source/UI/Shortcuts/UIShortCutWnd.h index 4722cbfc..be0ad5c4 100644 --- a/Source/UI/Shortcuts/UIShortCutWnd.h +++ b/Source/UI/Shortcuts/UIShortCutWnd.h @@ -32,7 +32,7 @@ struct ShortcutWindowContext { class UIShortCutWnd : public UIFrameWnd { public: - UIShortCutWnd(UIWindowContext& windows, ShortcutWindowContext& shortcuts); + UIShortCutWnd(ShortcutWindowContext& shortcuts); ~UIShortCutWnd() override; bool Slot03() override; diff --git a/Source/UI/Text/UIStaticText.h b/Source/UI/Text/UIStaticText.h index 5c7b357e..90bc4e52 100644 --- a/Source/UI/Text/UIStaticText.h +++ b/Source/UI/Text/UIStaticText.h @@ -9,8 +9,6 @@ class UIStaticText : public UIWindow { public: UIStaticText(); - UIStaticText(UIWindowContext&) : UIStaticText() { - } ~UIStaticText() override; void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Text/UIStaticText_LF.h b/Source/UI/Text/UIStaticText_LF.h index 38dbc8ef..fdb4cb04 100644 --- a/Source/UI/Text/UIStaticText_LF.h +++ b/Source/UI/Text/UIStaticText_LF.h @@ -10,8 +10,6 @@ public: // INLINED UIStaticText_LF(unsigned char cached) : UIWindow(cached), m_lineSpacing(0), m_align(0), m_fontFamily(0), m_fontHeight(12), m_textColor(0), m_bold(0) {} - UIStaticText_LF(UIWindowContext&, unsigned char cached) : UIStaticText_LF(cached) { - } void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Text/UITextViewer.h b/Source/UI/Text/UITextViewer.h index 555736d6..12937b08 100644 --- a/Source/UI/Text/UITextViewer.h +++ b/Source/UI/Text/UITextViewer.h @@ -14,8 +14,6 @@ class UITextViewer : public UIListBox { public: UITextViewer(); - UITextViewer(UIWindowContext&) : UITextViewer() { - } ~UITextViewer() override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/UIScrollWnd.h b/Source/UI/UIScrollWnd.h index 81d84539..93a607a3 100644 --- a/Source/UI/UIScrollWnd.h +++ b/Source/UI/UIScrollWnd.h @@ -12,8 +12,6 @@ class UIScrollBar; class UIScrollWnd : public UIWindow { public: UIScrollWnd(int width, int height, unsigned char cached); - UIScrollWnd(UIWindowContext&, int width, int height, unsigned char cached) : UIScrollWnd(width, height, cached) { - } ~UIScrollWnd() override; void Resize(int width, int height) override; void Slot15(int width, int height) override; @@ -30,7 +28,7 @@ public: // INLINED int& ViewWidth() { - return reinterpret_cast(this->m_context); + return reinterpret_cast(this->unknown_007C); } bool Update(int redraw) override; diff --git a/Source/UI/Window/UIEmblemWnd.cpp b/Source/UI/Window/UIEmblemWnd.cpp index 385b1d50..b9828382 100644 --- a/Source/UI/Window/UIEmblemWnd.cpp +++ b/Source/UI/Window/UIEmblemWnd.cpp @@ -85,6 +85,6 @@ int UIEmblemWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argument1, // OFFSET: 0x0084FD80 // FUNCTION: fn_10665 -UIEmblemWnd::UIEmblemWnd(UIWindowContext& windows) : UIWindow(windows, 0), aid(0), guildId(0) { +UIEmblemWnd::UIEmblemWnd() : UIWindow(0), aid(0), guildId(0) { this->SetSize(24, 24); } diff --git a/Source/UI/Window/UIEmblemWnd.h b/Source/UI/Window/UIEmblemWnd.h index f47da20e..906a42f0 100644 --- a/Source/UI/Window/UIEmblemWnd.h +++ b/Source/UI/Window/UIEmblemWnd.h @@ -8,7 +8,6 @@ class UIEmblemWnd : public UIWindow { public: UIEmblemWnd(); - explicit UIEmblemWnd(UIWindowContext& windows); void Slot15(int width, int height) override; void Slot19() override; void Paint() override; diff --git a/Source/UI/Window/UIEscOptionWnd.cpp b/Source/UI/Window/UIEscOptionWnd.cpp index 96fbdc58..bad8340d 100644 --- a/Source/UI/Window/UIEscOptionWnd.cpp +++ b/Source/UI/Window/UIEscOptionWnd.cpp @@ -17,7 +17,7 @@ void UIEscOptionWnd::Slot15(int, int) { const char* names[7] = {"esc_01", "esc_001", "esc_08", "esc_09", "esc_02", "esc_05", "esc_10"}; for (int i = 0; i < 7; ++i) { - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); this->m_buttons[i] = button; button->SetBitmap((prefix + names[i] + "a.bmp").c_str(), 0, 0); button->SetBitmap((prefix + names[i] + "b.bmp").c_str(), 1, 0); @@ -66,8 +66,8 @@ void UIEscOptionWnd::LayoutButtons() { // OFFSET: 0x00911250 // FUNCTION: fn_12512 -UIEscOptionWnd::UIEscOptionWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_titleHeight(17) { +UIEscOptionWnd::UIEscOptionWnd() + : UIFrameWnd(0), m_titleHeight(17) { CGameMode* mode = static_cast(g_modeMgr.GetGameMode()); int escMode; if (mode->unknown_0250 == 0) { diff --git a/Source/UI/Window/UIEscOptionWnd.h b/Source/UI/Window/UIEscOptionWnd.h index 6b6d62c9..1785edf9 100644 --- a/Source/UI/Window/UIEscOptionWnd.h +++ b/Source/UI/Window/UIEscOptionWnd.h @@ -10,7 +10,7 @@ class UIButton; class UIEscOptionWnd : public UIFrameWnd { public: - UIEscOptionWnd(UIWindowContext& windows); + UIEscOptionWnd(); void Paint() 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/Window/UIFrameWnd.h b/Source/UI/Window/UIFrameWnd.h index 6200b516..bbe23b17 100644 --- a/Source/UI/Window/UIFrameWnd.h +++ b/Source/UI/Window/UIFrameWnd.h @@ -11,8 +11,6 @@ class UICheckBox; class UIFrameWnd : public UIWindow { public: UIFrameWnd(unsigned char cached); - UIFrameWnd(UIWindowContext&, unsigned char cached) : UIFrameWnd(cached) { - } ~UIFrameWnd() override; bool Slot02() override; void Move(int x, int y) override; diff --git a/Source/UI/Window/UIJobListWnd.cpp b/Source/UI/Window/UIJobListWnd.cpp index 833e8a49..a4fc49d7 100644 --- a/Source/UI/Window/UIJobListWnd.cpp +++ b/Source/UI/Window/UIJobListWnd.cpp @@ -34,7 +34,7 @@ static_assert(sizeof(PartyBookingUpdatePacket) == 14); void UIJobListWnd::Slot15(int width, int height) { char title[9] = {}; std::sprintf(title, "Job List"); - this->m_title = new UIStaticText(*this->m_context); + this->m_title = new UIStaticText(); this->m_title->SetSize(this->geometry.width - 32, 15); this->m_title->SetTextFitted(title); this->m_title->Move(16, 2); @@ -43,7 +43,7 @@ void UIJobListWnd::Slot15(int width, int height) { this->AddCloseButton("", 0); const std::string path = "유저인터페이스\\"; - this->m_okButton = new UIBitmapButton(*this->m_context); + this->m_okButton = new UIBitmapButton(); this->m_okButton->SetBitmap((path + "btn_ok" + ".bmp").c_str(), 0, 0); this->m_okButton->SetBitmap((path + "btn_ok_a" + ".bmp").c_str(), 1, 0); this->m_okButton->SetBitmap((path + "btn_ok_b" + ".bmp").c_str(), 2, 0); @@ -148,7 +148,7 @@ void UIJobListWnd::RefreshJobs() { int index = 0; for (auto it = g_partyBookingJobs.begin(); it != g_partyBookingJobs.end(); ++it, ++index) { - this->m_jobChecks[index] = new UICheckBox(*this->m_context); + this->m_jobChecks[index] = new UICheckBox(); this->m_jobChecks[index]->SetSize(120, 15); const int job = it->first; if (job == -1) { @@ -175,6 +175,6 @@ void UIJobListWnd::RefreshJobs() { // OFFSET: 0x00911410 // FUNCTION: fn_12514 -UIJobListWnd::UIJobListWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_title(nullptr), m_okButton(nullptr), unknown_00E8(0) { +UIJobListWnd::UIJobListWnd() + : UIFrameWnd(0), m_title(nullptr), m_okButton(nullptr), unknown_00E8(0) { } diff --git a/Source/UI/Window/UIJobListWnd.h b/Source/UI/Window/UIJobListWnd.h index 3696f1f7..ac476a6f 100644 --- a/Source/UI/Window/UIJobListWnd.h +++ b/Source/UI/Window/UIJobListWnd.h @@ -14,7 +14,7 @@ extern std::map g_partyBookingJobs; class UIJobListWnd : public UIFrameWnd { public: - UIJobListWnd(UIWindowContext& windows); + UIJobListWnd(); void Slot11() override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/Window/UIMessageBox.h b/Source/UI/Window/UIMessageBox.h index d0499feb..a121632d 100644 --- a/Source/UI/Window/UIMessageBox.h +++ b/Source/UI/Window/UIMessageBox.h @@ -22,8 +22,6 @@ struct UIMessageBoxContext { class UIMessageBox : public UIFrameWnd { public: UIMessageBox(UIMessageBoxContext& dialog); - UIMessageBox(UIWindowContext&, UIMessageBoxContext& dialog) : UIMessageBox(dialog) { - } ~UIMessageBox() override; void Slot18() override; void Slot19() override; diff --git a/Source/UI/Window/UIMileageWnd.cpp b/Source/UI/Window/UIMileageWnd.cpp index c90a9735..8a9dff2f 100644 --- a/Source/UI/Window/UIMileageWnd.cpp +++ b/Source/UI/Window/UIMileageWnd.cpp @@ -161,7 +161,7 @@ int UIMileageWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::i // OFFSET: 0x00946B50 // FUNCTION: fn_12850 -UIMileageWnd::UIMileageWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_startTime(0), m_point(0), m_remaining(0), m_bonus(1) { +UIMileageWnd::UIMileageWnd() + : UIFrameWnd(0), m_startTime(0), m_point(0), m_remaining(0), m_bonus(1) { this->m_tooltip.clear(); } diff --git a/Source/UI/Window/UIMileageWnd.h b/Source/UI/Window/UIMileageWnd.h index e7d164e8..a651c5f8 100644 --- a/Source/UI/Window/UIMileageWnd.h +++ b/Source/UI/Window/UIMileageWnd.h @@ -9,7 +9,7 @@ class UIMileageWnd : public UIFrameWnd { public: - UIMileageWnd(UIWindowContext& windows); + UIMileageWnd(); void Paint() override; void Slot19() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Window/UIMiniBtnWnd.cpp b/Source/UI/Window/UIMiniBtnWnd.cpp index acdabee9..59c938e2 100644 --- a/Source/UI/Window/UIMiniBtnWnd.cpp +++ b/Source/UI/Window/UIMiniBtnWnd.cpp @@ -63,5 +63,5 @@ void UIMiniBtnWnd::Toggle() { // OFFSET: 0x009114F0 // FUNCTION: fn_12516 -UIMiniBtnWnd::UIMiniBtnWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0), m_windowId(-1) { +UIMiniBtnWnd::UIMiniBtnWnd() : UIFrameWnd(0), m_windowId(-1) { } diff --git a/Source/UI/Window/UIMiniBtnWnd.h b/Source/UI/Window/UIMiniBtnWnd.h index ec260537..3bb21dc1 100644 --- a/Source/UI/Window/UIMiniBtnWnd.h +++ b/Source/UI/Window/UIMiniBtnWnd.h @@ -7,7 +7,7 @@ class UIMiniBtnWnd : public UIFrameWnd { public: - UIMiniBtnWnd(UIWindowContext& windows); + UIMiniBtnWnd(); 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 b28864d3..d3729cef 100644 --- a/Source/UI/Window/UINavigationHelpWnd.cpp +++ b/Source/UI/Window/UINavigationHelpWnd.cpp @@ -9,7 +9,7 @@ // OFFSET: 0x00921530 // FUNCTION: fn_12642 void UINavigationHelpWnd::Slot15(int width, int height) { - this->m_viewer = new UITextViewer(*this->m_context); + this->m_viewer = new UITextViewer(); this->m_viewer->Configure(5, 22, width - 10, height - 27, 0); this->m_viewer->backgroundRed = 0xd2; this->m_viewer->backgroundGreen = 0xd2; @@ -68,6 +68,6 @@ int UINavigationHelpWnd::SendMsg(UIWindow*, int message, std::intptr_t a, std::i // OFFSET: 0x009115B0 // FUNCTION: fn_12517 -UINavigationHelpWnd::UINavigationHelpWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_viewer(nullptr), unknown_00B8(0) { +UINavigationHelpWnd::UINavigationHelpWnd() + : UIFrameWnd(0), m_viewer(nullptr), unknown_00B8(0) { } diff --git a/Source/UI/Window/UINavigationHelpWnd.h b/Source/UI/Window/UINavigationHelpWnd.h index d99c55a7..fa4f70fe 100644 --- a/Source/UI/Window/UINavigationHelpWnd.h +++ b/Source/UI/Window/UINavigationHelpWnd.h @@ -7,7 +7,7 @@ class UITextViewer; class UINavigationHelpWnd : public UIFrameWnd { public: - UINavigationHelpWnd(UIWindowContext& windows); + UINavigationHelpWnd(); 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/Window/UINewSkillListWnd.cpp b/Source/UI/Window/UINewSkillListWnd.cpp index 6a7cf7be..06d6da18 100644 --- a/Source/UI/Window/UINewSkillListWnd.cpp +++ b/Source/UI/Window/UINewSkillListWnd.cpp @@ -784,7 +784,7 @@ bool UINewSkillListWnd::IsSkillArea(int x, int y) { // OFFSET: 0x009B1050 // FUNCTION: fn_13814 void UINewSkillListWnd::Slot15(int width, int height) { - this->m_tabs = new UITabControl(*this->m_context); + this->m_tabs = new UITabControl(); this->m_tabs->Configure(0, 17, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0); this->m_tabs->Move(0, 6); this->AddChild(this->m_tabs); @@ -797,14 +797,14 @@ void UINewSkillListWnd::Slot15(int width, int height) { this->m_btnMinimize->Move(this->geometry.width - 30, 5); this->m_btnClose->Move(this->geometry.width - 16, 5); - this->m_scrollBar = new UIScrollBar(*this->m_context); + this->m_scrollBar = new UIScrollBar(); this->m_scrollBar->Configure(this->geometry.width - 15, 20, 1, this->geometry.height - this->m_topMargin - this->m_bottomMargin); this->m_scrollBar->Move(this->geometry.width - 15, 20); this->m_scrollBar->SetSize(this->m_scrollBar->geometry.width, this->geometry.height - this->m_topMargin - this->m_bottomMargin); this->AddChild(this->m_scrollBar); for (int i = 0; i < 10; ++i) { - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); button->SetBitmap("유저인터페이스\\basic_interface\\skill_up_a.bmp", 0, 0); button->SetBitmap("유저인터페이스\\basic_interface\\skill_up_b.bmp", 1, 0); button->SetBitmap("유저인터페이스\\basic_interface\\skill_up_c.bmp", 2, 0); @@ -816,7 +816,7 @@ void UINewSkillListWnd::Slot15(int width, int height) { } for (int i = 0; i < 42; ++i) { - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); button->SetBitmap("유저인터페이스\\basic_interface\\arw_left.bmp", 0, 0); button->SetBitmap("유저인터페이스\\basic_interface\\arw_left.bmp", 1, 0); button->SetBitmap("유저인터페이스\\basic_interface\\arw_left.bmp", 2, 0); @@ -828,7 +828,7 @@ void UINewSkillListWnd::Slot15(int width, int height) { } for (int i = 0; i < 42; ++i) { - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); button->SetBitmap("유저인터페이스\\basic_interface\\arw_right.bmp", 0, 0); button->SetBitmap("유저인터페이스\\basic_interface\\arw_right.bmp", 1, 0); button->SetBitmap("유저인터페이스\\basic_interface\\arw_right.bmp", 2, 0); @@ -841,7 +841,7 @@ void UINewSkillListWnd::Slot15(int width, int height) { const char* baseDir = "유저인터페이스\\"; const char* applyNames[3] = {"btn_apply", "btn_apply_a", "btn_apply_b"}; - this->m_btnApply = new UIBitmapButton(*this->m_context); + this->m_btnApply = new UIBitmapButton(); for (int state = 0; state < 3; ++state) { std::string path = std::string(baseDir) + applyNames[state] + ".bmp"; this->m_btnApply->SetBitmap(Resolve(path.c_str()), state, 0); @@ -854,7 +854,7 @@ void UINewSkillListWnd::Slot15(int width, int height) { this->AddChild(this->m_btnApply); const char* resetNames[3] = {"btn_reset", "btn_reset_a", "btn_reset_b"}; - this->m_btnCancel = new UIBitmapButton(*this->m_context); + this->m_btnCancel = new UIBitmapButton(); for (int state = 0; state < 3; ++state) { std::string path = std::string(baseDir) + resetNames[state] + ".bmp"; this->m_btnCancel->SetBitmap(Resolve(path.c_str()), state, 0); @@ -866,7 +866,7 @@ void UINewSkillListWnd::Slot15(int width, int height) { this->m_btnCancel->Invalidate(); this->AddChild(this->m_btnCancel); - this->m_btnDetail = new UIResizer(*this->m_context); + this->m_btnDetail = new UIResizer(); this->m_btnDetail->SetSize(16, 16); this->m_btnDetail->SetDirection(3); this->m_btnDetail->SetBitmapName("유저인터페이스\\btn_resize.bmp"); @@ -1737,7 +1737,7 @@ void UINewSkillListWnd::sub_9AF960() { // OFFSET: 0x009AE260 // FUNCTION: fn_13797 -UINewSkillListWnd::UINewSkillListWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UINewSkillListWnd::UINewSkillListWnd() : UIFrameWnd(0) { this->m_tab = 0; this->m_needsRedraw = 1; this->m_selectedSkill = -1; diff --git a/Source/UI/Window/UINewSkillListWnd.h b/Source/UI/Window/UINewSkillListWnd.h index 8cd8d309..ceb56670 100644 --- a/Source/UI/Window/UINewSkillListWnd.h +++ b/Source/UI/Window/UINewSkillListWnd.h @@ -24,7 +24,7 @@ struct NewSkillListValue { class UINewSkillListWnd : public UIFrameWnd { public: - UINewSkillListWnd(UIWindowContext& windows); + UINewSkillListWnd(); __declspec(noinline) ~UINewSkillListWnd() override; void Slot11() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Window/UINoteWnd.cpp b/Source/UI/Window/UINoteWnd.cpp index 3cf93b6e..85c75b86 100644 --- a/Source/UI/Window/UINoteWnd.cpp +++ b/Source/UI/Window/UINoteWnd.cpp @@ -9,13 +9,13 @@ // OFFSET: 0x0094C2D0 // FUNCTION: fn_12895 void UINoteWnd::Slot15(int width, int height) { - UIBasicButton* button = new UIBasicButton(*this->m_context); + UIBasicButton* button = new UIBasicButton(); button->Configure(60, LookupMessage(0xBE5)); button->Move(width - 68, height - 26); button->SetId(201); this->AddChild(button); - this->m_scroll = new UINoteWnd_Scroll(*this->m_context, width - 35, height - 59); + this->m_scroll = new UINoteWnd_Scroll(width - 35, height - 59); this->m_scroll->Move(16, 16); this->AddChild(this->m_scroll); } @@ -65,8 +65,8 @@ void UINoteWnd_Scroll::Slot35(int delta) { // OFFSET: 0x00946D00 // FUNCTION: fn_12852 -UINoteWnd::UINoteWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_scroll(nullptr) { +UINoteWnd::UINoteWnd() + : UIFrameWnd(0), m_scroll(nullptr) { } // OFFSET: 0x00950840 @@ -79,7 +79,7 @@ int UINoteWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argument1, s } else if (message == 0x22) { UINoteWnd_Scroll* scroll = this->m_scroll; const std::string text = LookupMessage(static_cast(argument1)); - UIStaticText_LF* label = new UIStaticText_LF(*this->m_context, 0); + UIStaticText_LF* label = new UIStaticText_LF(0); scroll->m_text = label; label->SetSize(scroll->geometry.width - 13, 12); label->Move(0, 0); diff --git a/Source/UI/Window/UINoteWnd.h b/Source/UI/Window/UINoteWnd.h index 11d4b2df..571292f5 100644 --- a/Source/UI/Window/UINoteWnd.h +++ b/Source/UI/Window/UINoteWnd.h @@ -9,7 +9,7 @@ class UIStaticText_LF; class UINoteWnd_Scroll : public UIScrollWnd { public: // INLINED - UINoteWnd_Scroll(UIWindowContext& windows, int width, int height) : UIScrollWnd(windows, width, height, 0), m_text(nullptr) { + UINoteWnd_Scroll(int width, int height) : UIScrollWnd(width, height, 0), m_text(nullptr) { this->SetSize(width, height); } void Paint() override; @@ -22,7 +22,7 @@ public: class UINoteWnd : public UIFrameWnd { public: - UINoteWnd(UIWindowContext& windows); + UINoteWnd(); 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/UIOpenMailBoxWnd.cpp b/Source/UI/Window/UIOpenMailBoxWnd.cpp index 3ee0d9a6..51be5699 100644 --- a/Source/UI/Window/UIOpenMailBoxWnd.cpp +++ b/Source/UI/Window/UIOpenMailBoxWnd.cpp @@ -12,7 +12,7 @@ void UIOpenMailBoxWnd::Slot53() { // OFFSET: 0x0094C410 // FUNCTION: fn_12896 void UIOpenMailBoxWnd::Slot15(int width, int height) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\icon_noti_gotmail.bmp", 0, 0); button->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\icon_noti_gotmail.bmp", 1, 0); button->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\icon_noti_gotmail.bmp", 2, 0); @@ -66,6 +66,6 @@ int UIOpenMailBoxWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, st // OFFSET: 0x00946DE0 // FUNCTION: fn_12853 -UIOpenMailBoxWnd::UIOpenMailBoxWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIOpenMailBoxWnd::UIOpenMailBoxWnd() + : UIFrameWnd(0) { } diff --git a/Source/UI/Window/UIOpenMailBoxWnd.h b/Source/UI/Window/UIOpenMailBoxWnd.h index f993ab33..7869bd10 100644 --- a/Source/UI/Window/UIOpenMailBoxWnd.h +++ b/Source/UI/Window/UIOpenMailBoxWnd.h @@ -6,7 +6,7 @@ class UIOpenMailBoxWnd : public UIFrameWnd { public: - UIOpenMailBoxWnd(UIWindowContext& windows); + UIOpenMailBoxWnd(); 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/Window/UIOpenRoulletteWnd.cpp b/Source/UI/Window/UIOpenRoulletteWnd.cpp index fdd829fc..ba60bc44 100644 --- a/Source/UI/Window/UIOpenRoulletteWnd.cpp +++ b/Source/UI/Window/UIOpenRoulletteWnd.cpp @@ -23,7 +23,7 @@ void UIOpenRoulletteWnd::Slot19() { // OFFSET: 0x0094C4E0 // FUNCTION: fn_12897 void UIOpenRoulletteWnd::Slot15(int width, int height) { - auto* button = new UIBitmapButton(*this->m_context); + auto* button = new UIBitmapButton(); button->SetBitmap("유저인터페이스\\basic_interface\\roullette\\RoulletteIcon.bmp", 0, 0); button->SetBitmap("유저인터페이스\\basic_interface\\roullette\\RoulletteIcon.bmp", 1, 0); button->SetBitmap("유저인터페이스\\basic_interface\\roullette\\RoulletteIcon.bmp", 2, 0); @@ -56,6 +56,6 @@ int UIOpenRoulletteWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, // OFFSET: 0x00946E40 // FUNCTION: fn_12854 -UIOpenRoulletteWnd::UIOpenRoulletteWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIOpenRoulletteWnd::UIOpenRoulletteWnd() + : UIFrameWnd(0) { } diff --git a/Source/UI/Window/UIOpenRoulletteWnd.h b/Source/UI/Window/UIOpenRoulletteWnd.h index 2f0940c1..181a57df 100644 --- a/Source/UI/Window/UIOpenRoulletteWnd.h +++ b/Source/UI/Window/UIOpenRoulletteWnd.h @@ -6,7 +6,7 @@ class UIOpenRoulletteWnd : public UIFrameWnd { public: - UIOpenRoulletteWnd(UIWindowContext& windows); + UIOpenRoulletteWnd(); void Slot19() override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/Window/UIPartyBookingHelpWnd.cpp b/Source/UI/Window/UIPartyBookingHelpWnd.cpp index 8b8a5a2e..0399c2df 100644 --- a/Source/UI/Window/UIPartyBookingHelpWnd.cpp +++ b/Source/UI/Window/UIPartyBookingHelpWnd.cpp @@ -16,7 +16,7 @@ void UIPartyBookingHelpWnd::Slot15(int width, int height) { this->AddBaseButton(); this->AddCloseButton("", 0); - this->m_viewer = new UITextViewer(*this->m_context); + this->m_viewer = new UITextViewer(); this->m_viewer->Configure(10, 25, width - 20, height - 35, 1); this->AddChild(this->m_viewer); @@ -53,6 +53,6 @@ int UIPartyBookingHelpWnd::SendMsg(UIWindow* sender, int message, std::intptr_t // OFFSET: 0x00911860 // FUNCTION: fn_12519 -UIPartyBookingHelpWnd::UIPartyBookingHelpWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UIPartyBookingHelpWnd::UIPartyBookingHelpWnd() + : UIFrameWnd(0) { } diff --git a/Source/UI/Window/UIPartyBookingHelpWnd.h b/Source/UI/Window/UIPartyBookingHelpWnd.h index 5b6dac91..2d61028d 100644 --- a/Source/UI/Window/UIPartyBookingHelpWnd.h +++ b/Source/UI/Window/UIPartyBookingHelpWnd.h @@ -7,7 +7,7 @@ class UITextViewer; class UIPartyBookingHelpWnd : public UIFrameWnd { public: - UIPartyBookingHelpWnd(UIWindowContext& windows); + UIPartyBookingHelpWnd(); 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/UIPetEvolutionWnd.cpp b/Source/UI/Window/UIPetEvolutionWnd.cpp index cdeff620..6d5ea309 100644 --- a/Source/UI/Window/UIPetEvolutionWnd.cpp +++ b/Source/UI/Window/UIPetEvolutionWnd.cpp @@ -22,7 +22,7 @@ // OFFSET: 0x009AAF30 // FUNCTION: fn_13761 -UIPetEvolutionWnd::UIPetEvolutionWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UIPetEvolutionWnd::UIPetEvolutionWnd() : UIFrameWnd(0) { this->m_petEggId = -1; this->m_evolvedEggId = -1; } @@ -37,7 +37,7 @@ UIPetEvolutionWnd::~UIPetEvolutionWnd() { void UIPetEvolutionWnd::Slot15(int width, int height) { this->AddCloseButton("", 0); - UIBitmapButton* okButton = new UIBitmapButton(*this->m_context); + UIBitmapButton* okButton = new UIBitmapButton(); okButton->SetBitmap("유저인터페이스\\btn_big_ok.bmp", 0, 0); okButton->SetBitmap("유저인터페이스\\btn_big_ok_a.bmp", 1, 0); okButton->SetBitmap("유저인터페이스\\btn_big_ok_b.bmp", 2, 0); @@ -46,7 +46,7 @@ void UIPetEvolutionWnd::Slot15(int width, int height) { okButton->SetId(184); this->AddChild(okButton); - UIBitmapButton* cancelButton = new UIBitmapButton(*this->m_context); + UIBitmapButton* cancelButton = new UIBitmapButton(); cancelButton->SetBitmap("유저인터페이스\\btn_big_cancel.bmp", 0, 0); cancelButton->SetBitmap("유저인터페이스\\btn_big_cancel_a.bmp", 1, 0); cancelButton->SetBitmap("유저인터페이스\\btn_big_cancel_b.bmp", 2, 0); @@ -199,7 +199,7 @@ int UIPetEvolutionWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argu void UIPetEvolutionWnd::RebuildButtons() { const char* name = g_session.GetPetString(g_session.GetPetJobByEggItem(this->m_petEggId)); if (name) { - UITextButton* button = new UITextButton(*this->m_context); + UITextButton* button = new UITextButton(); button->Configure(name, 0xFF6464, 0, 12, 1, 1); button->m_hoverColor = 0x9B9B9B; button->ResizeToTextClipped(button->geometry.width - 10, button->geometry.height); @@ -212,7 +212,7 @@ void UIPetEvolutionWnd::RebuildButtons() { name = g_session.GetPetString(g_session.GetPetJobByEggItem(this->m_evolvedEggId)); if (name) { - UITextButton* button = new UITextButton(*this->m_context); + UITextButton* button = new UITextButton(); button->Configure(name, 0xFF6464, 0, 12, 1, 1); button->m_hoverColor = 0x9B9B9B; button->ResizeToTextClipped(button->geometry.width - 10, button->geometry.height); @@ -232,7 +232,7 @@ void UIPetEvolutionWnd::RebuildButtons() { std::memset(text, 0, sizeof(text)); int capacity = sizeof(text); item.sub_6D5810(text, capacity, 0); - UITextButton* button = new UITextButton(*this->m_context); + UITextButton* button = new UITextButton(); button->Configure(text, 0xFF6464, 0, 12, 1, 1); button->m_hoverColor = 0x9B9B9B; button->ResizeToTextClipped(button->geometry.width, button->geometry.height); diff --git a/Source/UI/Window/UIPetEvolutionWnd.h b/Source/UI/Window/UIPetEvolutionWnd.h index 6eaf51fb..20613410 100644 --- a/Source/UI/Window/UIPetEvolutionWnd.h +++ b/Source/UI/Window/UIPetEvolutionWnd.h @@ -10,7 +10,7 @@ class UITextButton; class UIPetEvolutionWnd : public UIFrameWnd { public: - UIPetEvolutionWnd(UIWindowContext& windows); + UIPetEvolutionWnd(); ~UIPetEvolutionWnd() override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/Window/UIRPImageWnd.cpp b/Source/UI/Window/UIRPImageWnd.cpp index c731e395..c7fcf67f 100644 --- a/Source/UI/Window/UIRPImageWnd.cpp +++ b/Source/UI/Window/UIRPImageWnd.cpp @@ -2,6 +2,6 @@ // OFFSET: 0x0086E310 // FUNCTION: fn_11068 -UIRPImageWnd::UIRPImageWnd(UIWindowContext& context, std::string imageName, int imageCount) - : UIWindow(context, 1), m_imageName(imageName), m_imageCount(imageCount) { +UIRPImageWnd::UIRPImageWnd(std::string imageName, int imageCount) + : UIWindow(1), m_imageName(imageName), m_imageCount(imageCount) { } diff --git a/Source/UI/Window/UIRPImageWnd.h b/Source/UI/Window/UIRPImageWnd.h index 547ee5dc..afb9a964 100644 --- a/Source/UI/Window/UIRPImageWnd.h +++ b/Source/UI/Window/UIRPImageWnd.h @@ -7,7 +7,7 @@ class UIRPImageWnd : public UIWindow { public: - UIRPImageWnd(UIWindowContext& context, std::string imageName, int imageCount); + UIRPImageWnd(std::string imageName, int imageCount); void Paint() override; protected: diff --git a/Source/UI/Window/UIRPImageWnd2.cpp b/Source/UI/Window/UIRPImageWnd2.cpp index cce9423c..ce742c68 100644 --- a/Source/UI/Window/UIRPImageWnd2.cpp +++ b/Source/UI/Window/UIRPImageWnd2.cpp @@ -24,5 +24,5 @@ void UIRPImageWnd2::SetImage(std::string imageName, int imageCount) { // OFFSET: 0x00946F20 // FUNCTION: fn_12856 -UIRPImageWnd2::UIRPImageWnd2(UIWindowContext& windows) : UIFrameWnd(windows, 1), m_drawImage(0) { +UIRPImageWnd2::UIRPImageWnd2() : UIFrameWnd(1), m_drawImage(0) { } diff --git a/Source/UI/Window/UIRPImageWnd2.h b/Source/UI/Window/UIRPImageWnd2.h index e33d525f..e47df2ef 100644 --- a/Source/UI/Window/UIRPImageWnd2.h +++ b/Source/UI/Window/UIRPImageWnd2.h @@ -7,7 +7,7 @@ class UIRPImageWnd2 : public UIFrameWnd { public: - UIRPImageWnd2(UIWindowContext& windows); + UIRPImageWnd2(); void Paint() override; void SetImage(std::string imageName, int imageCount); diff --git a/Source/UI/Window/UIRebirthWnd.cpp b/Source/UI/Window/UIRebirthWnd.cpp index 4c042ed1..58db2ed1 100644 --- a/Source/UI/Window/UIRebirthWnd.cpp +++ b/Source/UI/Window/UIRebirthWnd.cpp @@ -23,7 +23,7 @@ void UIRebirthWnd::Slot15(int width, int height) { const RECT positions[5] = {{29, 22}, {29, 45}, {29, 68}, {29, 91}, {29, 119}}; for (int index = 0; index < 5; ++index) { - UIBitmapButton* button = new UIBitmapButton(*this->m_context); + UIBitmapButton* button = new UIBitmapButton(); button->SetBitmap((path + names[index][0] + ".bmp").c_str(), 0, 0); button->SetBitmap((path + names[index][1] + ".bmp").c_str(), 1, 0); button->SetBitmap((path + names[index][2] + ".bmp").c_str(), 2, 0); @@ -71,5 +71,5 @@ int UIRebirthWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argument1 // OFFSET: 0x00911950 // FUNCTION: fn_12521 -UIRebirthWnd::UIRebirthWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UIRebirthWnd::UIRebirthWnd() : UIFrameWnd(0) { } diff --git a/Source/UI/Window/UIRebirthWnd.h b/Source/UI/Window/UIRebirthWnd.h index 8ddacb2e..26e1160d 100644 --- a/Source/UI/Window/UIRebirthWnd.h +++ b/Source/UI/Window/UIRebirthWnd.h @@ -6,7 +6,7 @@ class UIRebirthWnd : public UIFrameWnd { public: - UIRebirthWnd(UIWindowContext& windows); + UIRebirthWnd(); 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/UIResizer.h b/Source/UI/Window/UIResizer.h index c3cd877f..ac770f75 100644 --- a/Source/UI/Window/UIResizer.h +++ b/Source/UI/Window/UIResizer.h @@ -9,8 +9,6 @@ class UIResizer : public UIWindow { public: UIResizer(); - UIResizer(UIWindowContext&) : UIResizer() { - } void Paint() override; void Slot25(int x, int y) override; void Slot27(int x, int y) override; diff --git a/Source/UI/Window/UIRoMapWnd.cpp b/Source/UI/Window/UIRoMapWnd.cpp index f4635a4a..05c410f5 100644 --- a/Source/UI/Window/UIRoMapWnd.cpp +++ b/Source/UI/Window/UIRoMapWnd.cpp @@ -674,7 +674,7 @@ void UIRoMapWnd::DrawMapMarker(const RoMapMarker& marker, unsigned char skipSele // OFFSET: 0x009119B0 // FUNCTION: fn_12522 -UIRoMapWnd::UIRoMapWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0), unknown_00D0(0) { +UIRoMapWnd::UIRoMapWnd() : UIFrameWnd(0), unknown_00D0(0) { g_luaScript->Call("ReadKafraMoveMapServiceInfo", ""); g_luaScript->Call("ReadKafraMiniMapPosInfo", ""); this->unknown_01FC.clear(); diff --git a/Source/UI/Window/UIRoMapWnd.h b/Source/UI/Window/UIRoMapWnd.h index eb693f3d..8b91109e 100644 --- a/Source/UI/Window/UIRoMapWnd.h +++ b/Source/UI/Window/UIRoMapWnd.h @@ -61,7 +61,7 @@ class UIRoMapWnd : public UIFrameWnd { friend class CFlyingShipRouteInfo; public: - UIRoMapWnd(UIWindowContext& windows); + UIRoMapWnd(); ~UIRoMapWnd() override; void Paint() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Window/UIRodexContentsWnd.cpp b/Source/UI/Window/UIRodexContentsWnd.cpp index bbd5ef1b..31224664 100644 --- a/Source/UI/Window/UIRodexContentsWnd.cpp +++ b/Source/UI/Window/UIRodexContentsWnd.cpp @@ -60,8 +60,8 @@ void UIRodexContentsWnd::SetContentsText(const char* text) { // OFFSET: 0x00801CE0 // FUNCTION: fn_10015 -UIRodexContentsWnd::UIRodexContentsWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), m_contents(nullptr), m_zeny(0), m_itemButton(nullptr), m_zenyButton(nullptr), unknown_0104(nullptr), +UIRodexContentsWnd::UIRodexContentsWnd() + : UIFrameWnd(0), m_contents(nullptr), m_zeny(0), m_itemButton(nullptr), m_zenyButton(nullptr), unknown_0104(nullptr), unknown_0108(nullptr) { this->m_items.clear(); this->m_itemIndex = 0; @@ -128,7 +128,7 @@ void UIRodexContentsWnd::Slot15(int, int) { mail->second.unknown_0001); if (store->unknown_0010 == 0 && (mail->second.unknown_0001 & 8) == 0 && mail->second.unknown_0194 == 0) { - UIBasicButton* report = new UIBasicButton(*this->m_context); + UIBasicButton* report = new UIBasicButton(); report->Configure(70, LookupMessage(3548)); report->Move(224, 29); report->SetId(310); @@ -139,7 +139,7 @@ void UIRodexContentsWnd::Slot15(int, int) { } } - this->unknown_0104 = new UIBasicButton(*this->m_context); + this->unknown_0104 = new UIBasicButton(); this->unknown_0104->Configure(50, LookupMessage(3542)); this->unknown_0104->Move(6, 376); this->unknown_0104->SetId(211); @@ -354,7 +354,7 @@ void UIRodexContentsWnd::SetMailContents(std::string title, std::string sender, this->m_sender = g_navigationLinkParser->ExpandMessages(this->m_sender); text = g_navigationLinkParser->ExpandMessages(text); - this->m_contents = new UIRodexEditCtrl3(*this->m_context); + this->m_contents = new UIRodexEditCtrl3(); this->m_contents->SetSize(267, 192); this->m_contents->invalidatesParent = 1; this->m_contents->Move(15, 81); @@ -380,7 +380,7 @@ void UIRodexContentsWnd::SetMailContents(std::string title, std::string sender, this->AddChild(this->m_contents); if (hasItem) { - this->m_itemButton = new UIBitmapButton(*this->m_context); + this->m_itemButton = new UIBitmapButton(); this->m_itemButton->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_receive_out.bmp", 0, 0); this->m_itemButton->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_receive_over.bmp", 1, 0); this->m_itemButton->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_receive_press.bmp", 2, 0); @@ -392,7 +392,7 @@ void UIRodexContentsWnd::SetMailContents(std::string title, std::string sender, if (zeny > 0) { this->m_zeny = zeny; - this->m_zenyButton = new UIBitmapButton(*this->m_context); + this->m_zenyButton = new UIBitmapButton(); this->m_zenyButton->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_receive_out.bmp", 0, 0); this->m_zenyButton->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_receive_over.bmp", 1, 0); this->m_zenyButton->SetBitmap("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\btn_receive_press.bmp", 2, 0); @@ -403,7 +403,7 @@ void UIRodexContentsWnd::SetMailContents(std::string title, std::string sender, } if (g_rodexMailStore->unknown_0010 == 0 && (flags & 8) == 0) { - this->unknown_0108 = new UIBasicButton(*this->m_context); + this->unknown_0108 = new UIBasicButton(); this->unknown_0108->Configure(70, LookupMessage(3543)); this->unknown_0108->Move(224, 376); this->unknown_0108->SetId(305); diff --git a/Source/UI/Window/UIRodexContentsWnd.h b/Source/UI/Window/UIRodexContentsWnd.h index bfe53f69..7a893a7a 100644 --- a/Source/UI/Window/UIRodexContentsWnd.h +++ b/Source/UI/Window/UIRodexContentsWnd.h @@ -14,7 +14,7 @@ class UIBasicButton; class UIRodexContentsWnd : public UIFrameWnd { public: - UIRodexContentsWnd(UIWindowContext& windows); + UIRodexContentsWnd(); void Paint() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Window/UISecondCostumeWnd.cpp b/Source/UI/Window/UISecondCostumeWnd.cpp index e557d482..062311e6 100644 --- a/Source/UI/Window/UISecondCostumeWnd.cpp +++ b/Source/UI/Window/UISecondCostumeWnd.cpp @@ -160,7 +160,7 @@ void UISecondCostumeWnd::Slot15(int width, int height) { this->LoadLists(); this->AddCloseButton("Close", 0); - this->m_list = new UIListBoxNavi(*this->m_context); + this->m_list = new UIListBoxNavi(); this->m_list->SetSize(width - 212, 160); this->m_list->backgroundRed = 210; this->m_list->backgroundGreen = 210; @@ -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_typeCombo = new UIComboBoxDefWnd(); this->m_typeCombo->dropdownHeight = 67; this->m_typeCombo->SetSize(width - 212, 18); this->m_typeCombo->Move(4, 20); @@ -187,7 +187,7 @@ void UISecondCostumeWnd::Slot15(int width, int height) { this->m_typeCombo->AddOption(LookupMessage(2766), 0); this->m_typeCombo->Select(this->m_tab); - auto* previous = new UIBitmapButton(*this->m_context); + auto* previous = new UIBitmapButton(); previous->SetBitmap("유저인터페이스\\scroll1left.bmp", 0, 0); previous->SetBitmap("유저인터페이스\\scroll1left.bmp", 1, 0); previous->SetBitmap("유저인터페이스\\scroll1left.bmp", 2, 0); @@ -196,7 +196,7 @@ void UISecondCostumeWnd::Slot15(int width, int height) { previous->SetId(227); this->AddChild(previous); - auto* next = new UIBitmapButton(*this->m_context); + auto* next = new UIBitmapButton(); next->SetBitmap("유저인터페이스\\scroll1right.bmp", 0, 0); next->SetBitmap("유저인터페이스\\scroll1right.bmp", 1, 0); next->SetBitmap("유저인터페이스\\scroll1right.bmp", 2, 0); @@ -287,8 +287,8 @@ bool UISecondCostumeWnd::Slot03() { // OFFSET: 0x00946FB0 // FUNCTION: fn_12857 -UISecondCostumeWnd::UISecondCostumeWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0) { +UISecondCostumeWnd::UISecondCostumeWnd() + : UIFrameWnd(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 f61f034c..d84489f3 100644 --- a/Source/UI/Window/UISecondCostumeWnd.h +++ b/Source/UI/Window/UISecondCostumeWnd.h @@ -18,7 +18,7 @@ struct SecondCostumeEntry { class UISecondCostumeWnd : public UIFrameWnd { public: - UISecondCostumeWnd(UIWindowContext& windows); + UISecondCostumeWnd(); bool Slot03() override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/Window/UISeekPartyMBWnd.cpp b/Source/UI/Window/UISeekPartyMBWnd.cpp index bd0fbedd..9259d421 100644 --- a/Source/UI/Window/UISeekPartyMBWnd.cpp +++ b/Source/UI/Window/UISeekPartyMBWnd.cpp @@ -160,7 +160,7 @@ void UISeekPartyMBWnd::CreateJobChecks() { int starts[8] = {1, 5, 11, 24, 30, 37, 43, 56}; for (int i = 0; i < counts[0]; ++i) { - UICheckBox* check = new UICheckBox(*this->m_context); + UICheckBox* check = new UICheckBox(); check->SetSize(110, 12); const int job = i + 1; check->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", LookupMessage(0x6AF + job)); @@ -178,7 +178,7 @@ void UISeekPartyMBWnd::CreateJobChecks() { for (int category = 1; category < 8; ++category) { for (int i = 0; i < counts[category]; ++i) { - UICheckBox* check = new UICheckBox(*this->m_context); + UICheckBox* check = new UICheckBox(); check->SetSize(110, 12); check->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", LookupMessage(0x65D + message)); if (i < 8) { @@ -253,8 +253,8 @@ void UISeekPartyMBWnd::ShowJobCategory(int category) { // OFFSET: 0x00911EE0 // FUNCTION: fn_12524 -UISeekPartyMBWnd::UISeekPartyMBWnd(UIWindowContext& windows) - : UIFrameWnd(windows, 0), unknown_00BC(nullptr), unknown_00C0(nullptr), m_levelEdit(nullptr), m_typeCombo(nullptr), m_subTypeCombo(nullptr), m_jobCategoryCombo(nullptr), +UISeekPartyMBWnd::UISeekPartyMBWnd() + : UIFrameWnd(0), unknown_00BC(nullptr), unknown_00C0(nullptr), m_levelEdit(nullptr), m_typeCombo(nullptr), m_subTypeCombo(nullptr), m_jobCategoryCombo(nullptr), m_jobChecks(), m_subTypes(), unknown_0154(nullptr), unknown_0158(nullptr), m_jobCategory(-1), m_subType(0), m_restoreHeight(0), m_minimized(0), m_titleText(nullptr), m_levelText(nullptr) { } @@ -269,7 +269,7 @@ void UISeekPartyMBWnd::Slot15(int width, int height) { std::memset(title, 0, sizeof(title)); std::sprintf(title, LookupMessage(0x698)); - this->m_titleText = new UIStaticText(*this->m_context); + this->m_titleText = new UIStaticText(); this->m_titleText->SetSize(this->geometry.width - 0x20, 0xF); this->m_titleText->SetTextFitted(title); this->m_titleText->Move(0x10, 2); @@ -281,7 +281,7 @@ void UISeekPartyMBWnd::Slot15(int width, int height) { std::string label; label = "LEVEL"; - this->m_levelText = new UIStaticText(*this->m_context); + this->m_levelText = new UIStaticText(); this->m_levelText->SetSize(this->geometry.width - 10, 0x1E); this->m_levelText->SetText(label.c_str(), 1); this->m_levelText->Move(10, 0x17); @@ -289,7 +289,7 @@ void UISeekPartyMBWnd::Slot15(int width, int height) { this->AddChild(this->m_levelText); label = "MAP"; - this->unknown_00BC = new UIStaticText(*this->m_context); + this->unknown_00BC = new UIStaticText(); this->unknown_00BC->SetSize(this->geometry.width - 10, 0x1E); this->unknown_00BC->SetText(label.c_str(), 1); this->unknown_00BC->Move(10, 0x2D); @@ -297,7 +297,7 @@ void UISeekPartyMBWnd::Slot15(int width, int height) { this->AddChild(this->unknown_00BC); label = "JOB"; - this->unknown_00C0 = new UIStaticText(*this->m_context); + this->unknown_00C0 = new UIStaticText(); this->unknown_00C0->SetSize(this->geometry.width - 10, 0x1E); this->unknown_00C0->SetText(label.c_str(), 1); this->unknown_00C0->Move(10, 0x46); @@ -306,7 +306,7 @@ void UISeekPartyMBWnd::Slot15(int width, int height) { { std::string path = "유저인터페이스\\"; - this->unknown_0158 = new UIBitmapButton(*this->m_context); + this->unknown_0158 = new UIBitmapButton(); this->unknown_0158->SetBitmap((path + "btn_ok" + ".bmp").c_str(), 0, 0); this->unknown_0158->SetBitmap((path + "btn_ok_a" + ".bmp").c_str(), 1, 0); this->unknown_0158->SetBitmap((path + "btn_ok_b" + ".bmp").c_str(), 2, 0); @@ -318,7 +318,7 @@ void UISeekPartyMBWnd::Slot15(int width, int height) { { std::string path = "유저인터페이스\\"; - this->unknown_0154 = new UIBitmapButton(*this->m_context); + this->unknown_0154 = new UIBitmapButton(); this->unknown_0154->SetBitmap((path + "btn_cancel" + ".bmp").c_str(), 0, 0); this->unknown_0154->SetBitmap((path + "btn_cancel_a" + ".bmp").c_str(), 1, 0); this->unknown_0154->SetBitmap((path + "btn_cancel_b" + ".bmp").c_str(), 2, 0); @@ -330,7 +330,7 @@ void UISeekPartyMBWnd::Slot15(int width, int height) { this->CreateJobChecks(); - this->m_levelEdit = new UIEditCtrl(*this->m_context); + this->m_levelEdit = new UIEditCtrl(); this->m_levelEdit->SetSize(0x28, 0x10); this->m_levelEdit->Move(0x32, 0x14); this->m_levelEdit->maximum = 5; @@ -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_jobCategoryCombo = new UIComboBoxDefWnd(); 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_typeCombo = new UIComboBoxDefWnd(); 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_subTypeCombo = new UIComboBoxDefWnd(); 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 9cce1988..f15df342 100644 --- a/Source/UI/Window/UISeekPartyMBWnd.h +++ b/Source/UI/Window/UISeekPartyMBWnd.h @@ -24,7 +24,7 @@ struct SeekPartyRegistration { class UISeekPartyMBWnd : public UIFrameWnd { public: - UISeekPartyMBWnd(UIWindowContext& windows); + UISeekPartyMBWnd(); ~UISeekPartyMBWnd() override; void Slot11() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Window/UIShowWarpWnd.cpp b/Source/UI/Window/UIShowWarpWnd.cpp index 6060da77..b1c6233c 100644 --- a/Source/UI/Window/UIShowWarpWnd.cpp +++ b/Source/UI/Window/UIShowWarpWnd.cpp @@ -12,7 +12,7 @@ // OFFSET: 0x0094CA20 // FUNCTION: fn_12899 void UIShowWarpWnd::Slot15(int width, int height) { - auto* list = new UIListBox(*this->m_context); + auto* list = new UIListBox(); this->m_list = list; width -= 0x18; height -= 0x32; @@ -32,7 +32,7 @@ void UIShowWarpWnd::Slot15(int width, int height) { this->AddChild(list); const std::string prefix = "유저인터페이스\\"; - auto* close = new UIBitmapButton(*this->m_context); + auto* close = new UIBitmapButton(); close->SetBitmap((prefix + "btn_close" + ".bmp").c_str(), 0, 0); close->SetBitmap((prefix + "btn_close_a" + ".bmp").c_str(), 1, 0); close->SetBitmap((prefix + "btn_close_b" + ".bmp").c_str(), 2, 0); @@ -83,6 +83,6 @@ int UIShowWarpWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argument // OFFSET: 0x009470C0 // FUNCTION: fn_12858 -UIShowWarpWnd::UIShowWarpWnd(UIWindowContext& windows, WindowResponseRecorder& recorder) - : UIFrameWnd(windows, 0), m_recorder(&recorder) { +UIShowWarpWnd::UIShowWarpWnd(WindowResponseRecorder& recorder) + : UIFrameWnd(0), m_recorder(&recorder) { } diff --git a/Source/UI/Window/UIShowWarpWnd.h b/Source/UI/Window/UIShowWarpWnd.h index 5c9d1de5..e23dcd0c 100644 --- a/Source/UI/Window/UIShowWarpWnd.h +++ b/Source/UI/Window/UIShowWarpWnd.h @@ -8,7 +8,7 @@ class UIListBox; class UIShowWarpWnd : public UIFrameWnd { public: - UIShowWarpWnd(UIWindowContext& windows, WindowResponseRecorder& recorder); + UIShowWarpWnd(WindowResponseRecorder& recorder); 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/UITransMenuWnd.cpp b/Source/UI/Window/UITransMenuWnd.cpp index 65ce1f72..91cca681 100644 --- a/Source/UI/Window/UITransMenuWnd.cpp +++ b/Source/UI/Window/UITransMenuWnd.cpp @@ -104,7 +104,7 @@ int UITransMenuWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std: // OFFSET: 0x009471E0 // FUNCTION: fn_12859 -UITransMenuWnd::UITransMenuWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UITransMenuWnd::UITransMenuWnd() : UIFrameWnd(0) { this->m_margin = 5; this->m_lineHeight = 12; this->m_selected = -1; diff --git a/Source/UI/Window/UITransMenuWnd.h b/Source/UI/Window/UITransMenuWnd.h index 283a68c0..494b0d01 100644 --- a/Source/UI/Window/UITransMenuWnd.h +++ b/Source/UI/Window/UITransMenuWnd.h @@ -14,7 +14,7 @@ struct TransMenuItem { class UITransMenuWnd : public UIFrameWnd { public: - UITransMenuWnd(UIWindowContext& windows); + UITransMenuWnd(); void Resize(int width, int height) override; void Move(int x, int y) override; bool Slot07(void* output) override; diff --git a/Source/UI/Window/UIVideoWnd.cpp b/Source/UI/Window/UIVideoWnd.cpp index 13baeb78..2c4a151d 100644 --- a/Source/UI/Window/UIVideoWnd.cpp +++ b/Source/UI/Window/UIVideoWnd.cpp @@ -14,8 +14,8 @@ // OFFSET: 0x00AB40C0 // FUNCTION: fn_17437 -UIVideoWnd::UIVideoWnd(UIWindowContext& windowContext) - : UIWindow(windowContext, 1), m_movie(nullptr), m_texture(nullptr), m_savedVolume(-1) { +UIVideoWnd::UIVideoWnd() + : UIWindow(1), m_movie(nullptr), m_texture(nullptr), m_savedVolume(-1) { this->m_movie = new BinkMovie(); } @@ -36,7 +36,7 @@ UIVideoWnd::~UIVideoWnd() { // OFFSET: 0x00AB4060 // FUNCTION: fn_17436 -UIVideoSkipButton::UIVideoSkipButton(UIWindowContext& windowContext) : UIButton(windowContext) { +UIVideoSkipButton::UIVideoSkipButton() : UIButton() { } // OFFSET: 0x00AB4380 @@ -48,7 +48,7 @@ bool UIVideoWnd::Slot02() { // OFFSET: 0x00AB4390 // FUNCTION: fn_17441 void UIVideoWnd::Slot15(int width, int height) { - UIVideoSkipButton* button = new UIVideoSkipButton(*this->m_context); + UIVideoSkipButton* button = new UIVideoSkipButton(); button->SetSize(127, 43); button->Move(width - button->geometry.width - 33, height - button->geometry.height - 110); button->SetId(521); diff --git a/Source/UI/Window/UIVideoWnd.h b/Source/UI/Window/UIVideoWnd.h index b4dbfa37..b0205f80 100644 --- a/Source/UI/Window/UIVideoWnd.h +++ b/Source/UI/Window/UIVideoWnd.h @@ -11,14 +11,14 @@ class CTexture; class UIVideoSkipButton : public UIButton { public: - UIVideoSkipButton(UIWindowContext& windowContext); + UIVideoSkipButton(); void Paint() override; }; class UIVideoWnd : public UIWindow { public: - UIVideoWnd(UIWindowContext& windowContext); + UIVideoWnd(); ~UIVideoWnd() override; bool Slot02() override; void Slot15(int width, int height) override; diff --git a/Source/UI/Window/UIViewCameraInfoWnd.cpp b/Source/UI/Window/UIViewCameraInfoWnd.cpp index bfd1fd49..a9ee8315 100644 --- a/Source/UI/Window/UIViewCameraInfoWnd.cpp +++ b/Source/UI/Window/UIViewCameraInfoWnd.cpp @@ -11,7 +11,7 @@ // OFFSET: 0x00A78B00 // FUNCTION: fn_16892 -UIViewCameraInfoWnd::UIViewCameraInfoWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0) { +UIViewCameraInfoWnd::UIViewCameraInfoWnd() : UIFrameWnd(0) { } // OFFSET: 0x00A78C20 diff --git a/Source/UI/Window/UIViewCameraInfoWnd.h b/Source/UI/Window/UIViewCameraInfoWnd.h index 65a7a8cd..9aa1a94c 100644 --- a/Source/UI/Window/UIViewCameraInfoWnd.h +++ b/Source/UI/Window/UIViewCameraInfoWnd.h @@ -8,7 +8,7 @@ class UIViewCameraInfoWnd : public UIFrameWnd { public: - UIViewCameraInfoWnd(UIWindowContext& windows); + UIViewCameraInfoWnd(); bool Slot08() override; void Slot15(int width, int height) override; void Paint() override; diff --git a/Source/UI/Window/UIWindow.h b/Source/UI/Window/UIWindow.h index 8816cd46..6f915c53 100644 --- a/Source/UI/Window/UIWindow.h +++ b/Source/UI/Window/UIWindow.h @@ -30,10 +30,6 @@ struct WindowReplayRecorder; struct ITEM_INFO; class UIItemTagButton; -struct UIWindowContext { - UITextViewer* const& chatConverter; -}; - class UIWindow : public UIRPData { friend struct WindowDialogs; friend class UIWindowMgr; @@ -44,8 +40,6 @@ class UIWindow : public UIRPData { public: explicit UIWindow(unsigned char cached); - UIWindow(UIWindowContext&, unsigned char cached) : UIWindow(cached) { - } ~UIWindow() override; virtual void Resize(int width, int height); virtual bool Slot02(); @@ -231,7 +225,7 @@ protected: /* 0078 */ unsigned char m_cached; /* 0079 */ unsigned char m_clip; - UIWindowContext* m_context; + /* 007C */ std::uint32_t unknown_007C; private: UIWindow* Parent() const; diff --git a/Source/UI/Window/WindowDialogs.cpp b/Source/UI/Window/WindowDialogs.cpp index 454779d8..a50acf43 100644 --- a/Source/UI/Window/WindowDialogs.cpp +++ b/Source/UI/Window/WindowDialogs.cpp @@ -158,7 +158,7 @@ int WindowDialogs::Confirm( return 185; } - auto* box = new UIMessageBox(this->windows, this->dialog); + auto* box = new UIMessageBox(this->dialog); this->latest = box; box->Configure(text, type, defaultAccept, timeout, caption, width, height, 1, nullptr); @@ -256,7 +256,7 @@ void WindowDialogs::AddMessageBox( return; } - auto* box = new UIMessageBox(this->windows, this->dialog); + auto* box = new UIMessageBox(this->dialog); box->Configure(text, type, defaultAccept, timeout, caption, width, height, 0, icon); this->dialog.retirement.rendered.push_back(box); diff --git a/Source/UI/Window/WindowDialogs.h b/Source/UI/Window/WindowDialogs.h index 588b65a9..520e885c 100644 --- a/Source/UI/Window/WindowDialogs.h +++ b/Source/UI/Window/WindowDialogs.h @@ -7,7 +7,6 @@ class UIWindow; class UIMessageBox; -struct UIWindowContext; struct UIMessageBoxContext; class ModalFramePump { @@ -19,7 +18,6 @@ protected: }; struct WindowDialogs { - UIWindowContext& windows; UIMessageBoxContext& dialog; int& result; std::set& suspendedRoots;