clank/rodecomp
1
0
Fork 0
Code Issues Wiki Activity

Maintenance: [forced, user-approved] Family C6: remove fabricated UIEditContext entirely. Original UIEditCtrl ctor (0x84FAE0) takes n

Browse source 
Batch #10192 by ragnarok-clanker: forced by an admin (20 lower score(s), 81 changed function(s)); checked with 87 compiled unit(s), including every includer of Source/UI/CashShop/UICashShopWnd.h, Source/UI/Chat/UISubChatHisWnd.h, Source/UI/Dialogs/UIEditctrlWnd.h, Source/UI/Dialogs/UIEmailAddressWnd.h, Source/UI/Dialogs/UIGraffiStrboxWnd.h, Source/UI/Dialogs/UINpcEditDialogWnd.h, Source/UI/Dialogs/UIPasswordWnd.h, Source/UI/Dialogs/UIProhibitListWnd.h, Source/UI/Dialogs/UITipboxWnd.h, Source/UI/Edit/UIEditBoxEx.h, Source/UI/Edit/UIEditCtrl.h, Source/UI/Edit/UIEditCtrl_Currency.h, Source/UI/Guild/UIGuildHelperWnd.h, Source/UI/Lists/UITreeView.h, Source/UI/Party/UIAdvenPartyBoardWnd.h, Source/UI/Party/UIPartySettingWnd.h, Source/UI/Party/UIRegisterPartyWnd.h, Source/UI/Rodex/UIRodexComposeWnd.h, Source/UI/UIChangeMaterialWnd.h, Source/UI/UIReputeWnd.h, Source/UI/Window/UIAccountLimitedToolWnd.h, Source/UI/Window/UIBank_NewWnd.h, Source/UI/Window/UIChatRoomWnd.h, Source/UI/Window/UICntWnd.h, Source/UI/Window/UIHomunInfoWnd.h, Source/UI/Window/UILoginOTPWnd.h, Source/UI/Window/UINavigationWnd.h, Source/UI/Window/UINewMakeCharWnd.h, Source/UI/Window/UIPetInfoWnd.h, Source/UI/Window/UIReplayRECControlWnd.h, Source/UI/Window/UISeekPartyListWnd.h, Source/UI/Window/UISeekPartyMBWnd.h, Source/UI/Window/UISerachStoreInfoWnd.h, Source/UI/Window/UITalkboxTrapInputWnd.h.
This commit is contained in:
ragnarok-clanker 2026-11-02 21:03:30 +00:00
commit 294630b65c
68 changed files with 113 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/Contents/CashEmotionMgr.cpp
View file

@ -278,7 +278,7 @@ static_assert(sizeof(CashEmotionPurchasePacket) == 7);
class UICashEmotionListWnd : public UIFrameWnd {
public:
UICashEmotionListWnd(UIWindowContext& windows, UIEditContext& edits);
UICashEmotionListWnd(UIWindowContext& windows);
void Slot11() override;
void Slot15(int width, int height) override;
void Slot19() override;
@ -313,7 +313,6 @@ protected:
/* 00E8 */ UICashEmotionListChildWnd_Abstract* m_currentList;
/* 00EC */ UIStaticText* m_period;
void* unknown_controls;
UIEditContext* m_edits;
};
class UICashEmotionMiniWnd : public UIWindow {
@ -2160,10 +2159,10 @@ int UICashEmotionListChildWnd_UnPurchased::SendMsg(UIWindow* sender, int message
// OFFSET: 0x007C6CB0
// FUNCTION: fn_09401
UICashEmotionListWnd::UICashEmotionListWnd(UIWindowContext& windows, UIEditContext& edits)
UICashEmotionListWnd::UICashEmotionListWnd(UIWindowContext& windows)
: UIFrameWnd(windows, 0), m_placement(nullptr), m_basicList(nullptr), m_purchaseList(nullptr), m_unpurchasedList(nullptr), m_searchList(nullptr),
m_tab(0), unknown_00D4(nullptr), m_searchEdit(nullptr), unknown_00DC(nullptr), unknown_00E0(nullptr), unknown_00E4(nullptr), m_currentList(nullptr),
m_period(nullptr), m_edits(&edits) {
m_period(nullptr) {
}
// OFFSET: 0x007C7240
@ -2233,7 +2232,7 @@ void UICashEmotionListWnd::Slot15(int width, int height) {
this->unknown_00E0 = this->CreateButton(252, 22, 37, 18, 191, "유저인터페이스\\cashemotion\\btn_shortui_%s.bmp", false);
this->unknown_00E4 = this->CreateButton(247, 355, 42, 20, 526, "유저인터페이스\\cashemotion\\btn_buy_%s.bmp", true);
this->m_searchEdit = new (std::nothrow) UIEditCtrl2(*this->m_context, *this->m_edits);
this->m_searchEdit = new (std::nothrow) UIEditCtrl2(*this->m_context);
if (this->m_searchEdit) {
this->m_searchEdit->SetSize(160, 16);
this->m_searchEdit->Move(61, 23);

20
Source/UI/Acceptance/UIChooseSellBuyWnd.cpp
View file

@ -426,7 +426,7 @@ void UIDisconnectedServerMsgWnd::Slot15(int width, int height) {
// FUNCTION: fn_12170
void UIEmailAddressWnd::Slot15(int, int) {
g_modeMgr.gameMode->SendMsg(10013, 0, 0, 0, 0);
this->m_edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->m_edit = new UIEditCtrl(*this->m_context);
this->m_edit->SetSize(this->geometry.width - 77, 16);
this->m_edit->Move(15, 22);
this->m_edit->maximum = 49;
@ -6226,8 +6226,8 @@ UINpcTextEditDialogWnd::UINpcTextEditDialogWnd(UIWindowContext& windows)
// OFFSET: 0x008C8B50
// FUNCTION: fn_11968
UIProhibitListWnd::UIProhibitListWnd(UIWindowContext& windows, UIEditContext& edits)
: UIFrameWnd(windows, 0), m_count(0), m_edits(&edits) {
UIProhibitListWnd::UIProhibitListWnd(UIWindowContext& windows)
: UIFrameWnd(windows, 0), m_count(0) {
}
// OFFSET: 0x008C8BB0
@ -6602,7 +6602,7 @@ void UINotifyQuestWnd::Slot15(int, int) {
// OFFSET: 0x008E4F50
// FUNCTION: fn_12188
void UINpcEditDialogWnd::Slot15(int, int) {
this->edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->edit = new UIEditCtrl(*this->m_context);
this->edit->SetSize(this->geometry.width - 77, 16);
this->edit->Move(15, 22);
this->edit->maximum = 12;
@ -6630,7 +6630,7 @@ void UINpcEditDialogWnd::Slot15(int, int) {
// OFFSET: 0x008E54B0
// FUNCTION: fn_12189
void UINpcTextEditDialogWnd::Slot15(int, int) {
this->edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->edit = new UIEditCtrl(*this->m_context);
this->edit->SetSize(this->geometry.width - 77, 16);
this->edit->Move(15, 22);
this->edit->maximum = 70;
@ -6736,7 +6736,7 @@ namespace {
// OFFSET: 0x008E5A20
// FUNCTION: fn_12190
void UIPartyInvitationToWnd::Slot15(int, int) {
this->m_edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->m_edit = new UIEditCtrl(*this->m_context);
this->m_edit->SetSize(120, 20);
this->m_edit->Move(20, 42);
this->m_edit->maximum = 23;
@ -7210,7 +7210,7 @@ int UIYourItemWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::
// OFFSET: 0x008E6B40
// FUNCTION: fn_12192
void UIPasswordWnd::Slot15(int, int) {
this->m_edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->m_edit = new UIEditCtrl(*this->m_context);
this->m_edit->SetSize(90, 16);
this->m_edit->Move(15, 22);
this->m_edit->maximum = 8;
@ -8435,7 +8435,7 @@ void UIItemCollectionWnd::Paint() {
// OFFSET: 0x008DB1F0
// FUNCTION: fn_12158
void UIAutoMessageWnd::Slot15(int, int) {
this->m_edit = new UIEditCtrl(*this->m_context, *reinterpret_cast<UIEditContext*>(nullptr));
this->m_edit = new UIEditCtrl(*this->m_context);
this->m_edit->SetSize(this->geometry.width - 77, 16);
this->m_edit->Move(15, 22);
this->m_edit->maximum = 100;
@ -10222,7 +10222,7 @@ int UIProhibitListWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, s
if (!IsMonsterJob(g_session.m_aid)) {
return 0;
}
counter = new UICntWnd(*this->m_context, *this->m_edits);
counter = new UICntWnd(*this->m_context);
counter->SetSize(0xB6, 0x2E);
counter->Move((g_renderer->viewport.width - 640) / 2 + 200, ScaleByScreenHeight(200));
g_windowMgr.AddRendered(counter);
@ -10237,7 +10237,7 @@ int UIProhibitListWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, s
if (a != 2 || !IsAdminAccount(g_session.m_aid)) {
return 0;
}
counter = new UICntWnd(*this->m_context, *this->m_edits);
counter = new UICntWnd(*this->m_context);
counter->SetSize(0xB6, 0x2E);
counter->Move((g_renderer->viewport.width - 640) / 2 + 200, ScaleByScreenHeight(200));
g_windowMgr.AddRendered(counter);

2
Source/UI/Buttons/UITextButton.cpp
View file

@ -2527,7 +2527,7 @@ void UITreeView::Slot15(int width, int height) {
vertical->Slot22(verticalWidth, height);
this->AddChild(this->verticalBar);
this->edit = new UIEditCtrl2(*this->m_context, *this->m_edit);
this->edit = new UIEditCtrl2(*this->m_context);
this->edit->SetSize(100, 19);
this->edit->Move(-100, -100);
this->AddChild(this->edit);

4
Source/UI/CashShop/UICashShopWnd.cpp
View file

@ -327,7 +327,7 @@ void UICashShopWnd::Slot15(int, int) {
this->unknown_00E4->SetId(0x19F);
this->AddChild(this->unknown_00E4);
this->unknown_00E0 = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->unknown_00E0 = new UIEditCtrl(*this->m_context);
this->unknown_00E0->SetSize(0x123, 0xE);
this->unknown_00E0->Move(0x5E, 0x206);
this->unknown_00E0->preserveInput = 1;
@ -354,7 +354,7 @@ void UICashShopWnd::Slot15(int, int) {
buy->SetId(0xE0);
this->AddChild(buy);
this->unknown_00F4 = new UIEditCtrl_Custom(*this->m_context, *this->m_editContext);
this->unknown_00F4 = new UIEditCtrl_Custom(*this->m_context);
this->unknown_00F4->SetSize(0x3E, 0xE);
this->unknown_00F4->Move(0x27C, 0x1C0);
this->unknown_00F4->unknown_0128 = 1;

2
Source/UI/CashShop/UICashShopWnd.h
View file

@ -16,7 +16,6 @@ class UIEditCtrl;
class UIEditCtrl_Custom;
class UIScrollBar_Custom;
class UIStaticBitmap;
struct UIEditContext;
class UICashShopWnd_Banner : public UIWindow {
public:
@ -129,7 +128,6 @@ public:
/* 00F8 */ std::vector<UICashShopWnd_Item*> m_itemWindows;
/* 0104 */ UICashShopWnd_Cart* m_cart;
void* unknown_controls;
UIEditContext* m_editContext;
};
void FormatMessageBuffer(char* buffer, const char* format, ...);

6
Source/UI/Chat/UISubChatHisWnd.cpp
View file

@ -197,7 +197,7 @@ void UISubChatHisWnd::Slot15(int width, int height) {
}
}
this->m_edit = new UIEditCtrl2(*this->m_context, *this->m_editContext);
this->m_edit = new UIEditCtrl2(*this->m_context);
this->m_edit->SetSize(100, 19);
this->m_edit->Move(-100, -100);
this->AddChild(this->m_edit);
@ -207,8 +207,8 @@ void UISubChatHisWnd::Slot15(int width, int height) {
// OFFSET: 0x00912340
// FUNCTION: fn_12529
UISubChatHisWnd::UISubChatHisWnd(UIWindowContext& windows, UIEditContext& edit)
: UIFrameWnd(windows, 0), m_editContext(&edit) {
UISubChatHisWnd::UISubChatHisWnd(UIWindowContext& windows)
: UIFrameWnd(windows, 0) {
this->m_saved = nullptr;
this->m_resizer = nullptr;
this->m_chatBox = nullptr;

4
Source/UI/Chat/UISubChatHisWnd.h
View file

@ -11,7 +11,6 @@ class UIEditCtrl;
class UIResizer;
class UIWindowMgr;
struct SubChatHisWndInfo;
struct UIEditContext;
struct SubChatHistoryState {
/* 0000 */ int unknown_0000;
@ -28,7 +27,7 @@ class UISubChatHisWnd : public UIFrameWnd {
public:
UISubChatHisWnd();
UISubChatHisWnd(UIWindowContext& windows, UIEditContext& edit);
UISubChatHisWnd(UIWindowContext& windows);
void Resize(int width, int height) override;
void Move(int x, int y) override;
void Slot11() override;
@ -61,7 +60,6 @@ private:
/* 0114 */ std::string m_name;
/* 012C */ UIEditCtrl* m_edit;
void* unknown_controls;
UIEditContext* m_editContext;
void* unknown_listContext;
};

6
Source/UI/Dialogs/UIEditctrlWnd.cpp
View file

@ -42,8 +42,8 @@ const char* g_miniMapMemoLineFormat = "%d\t%d\t%s\r\n";
// OFFSET: 0x0099B0C0
// FUNCTION: fn_13549
UIEditctrlWnd::UIEditctrlWnd(UIWindowContext& windows, UIEditContext& edit)
: UIFrameWnd(windows, 0), m_editContext(&edit) {
UIEditctrlWnd::UIEditctrlWnd(UIWindowContext& windows)
: UIFrameWnd(windows, 0) {
}
// OFFSET: 0x0099B120
@ -155,7 +155,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->m_editContext);
this->edit = new UIEditCtrl(*this->m_context);
this->edit->SetSize(200, 18);
this->edit->Move(5, 19);
this->edit->maximum = 20;

4
Source/UI/Dialogs/UIEditctrlWnd.h
View file

@ -3,12 +3,11 @@
#include "UI/Window/UIFrameWnd.h"
struct UIEditContext;
class UIEditCtrl;
class UIEditctrlWnd : public UIFrameWnd {
public:
UIEditctrlWnd(UIWindowContext& windows, UIEditContext& edit);
UIEditctrlWnd(UIWindowContext& windows);
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;
@ -17,7 +16,6 @@ public:
protected:
void* unknown_controls;
UIEditContext* m_editContext;
};
#endif

4
Source/UI/Dialogs/UIEmailAddressWnd.cpp
View file

@ -20,6 +20,6 @@ int UIEmailAddressWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, s
// OFFSET: 0x008C7800
// FUNCTION: fn_11939
UIEmailAddressWnd::UIEmailAddressWnd(UIWindowContext& windows, UIEditContext& edits)
: UIFrameWnd(windows, 0), m_editContext(&edits) {
UIEmailAddressWnd::UIEmailAddressWnd(UIWindowContext& windows)
: UIFrameWnd(windows, 0) {
}

4
Source/UI/Dialogs/UIEmailAddressWnd.h
View file

@ -3,12 +3,11 @@
#include "UI/Window/UIFrameWnd.h"
struct UIEditContext;
class UIEditCtrl;
class UIEmailAddressWnd : public UIFrameWnd {
public:
UIEmailAddressWnd(UIWindowContext& windows, UIEditContext& edits);
UIEmailAddressWnd(UIWindowContext& windows);
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;
@ -20,7 +19,6 @@ public:
/* 00B4 */ UIEditCtrl* m_edit;
protected:
UIEditContext* m_editContext;
};
#endif

6
Source/UI/Dialogs/UIGraffiStrboxWnd.cpp
View file

@ -9,7 +9,7 @@
// OFFSET: 0x008E1210
// FUNCTION: fn_12174
void UIGraffiStrboxWnd::Slot15(int, int) {
this->edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->edit = new UIEditCtrl(*this->m_context);
this->edit->SetSize(240, 16);
this->edit->Move(22, 50);
this->edit->maximum = 20;
@ -38,6 +38,6 @@ void UIGraffiStrboxWnd::Slot15(int, int) {
// OFFSET: 0x008C7C50
// FUNCTION: fn_11942
UIGraffiStrboxWnd::UIGraffiStrboxWnd(UIWindowContext& windows, UIEditContext& edits)
: UIFrameWnd(windows, 0), m_editContext(&edits) {
UIGraffiStrboxWnd::UIGraffiStrboxWnd(UIWindowContext& windows)
: UIFrameWnd(windows, 0) {
}

4
Source/UI/Dialogs/UIGraffiStrboxWnd.h
View file

@ -3,12 +3,11 @@
#include "UI/Window/UIFrameWnd.h"
struct UIEditContext;
class UIEditCtrl;
class UIGraffiStrboxWnd : public UIFrameWnd {
public:
UIGraffiStrboxWnd(UIWindowContext& windows, UIEditContext& edits);
UIGraffiStrboxWnd(UIWindowContext& windows);
void Slot15(int width, int height) override;
void Paint() override;
int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override;
@ -21,7 +20,6 @@ public:
UIEditCtrl* edit;
protected:
UIEditContext* m_editContext;
};
#endif

2
Source/UI/Dialogs/UINpcEditDialogWnd.h
View file

@ -7,7 +7,6 @@ class UIEditCtrl;
class UIItemTagOnMegaPhone;
struct ITEM_INFO;
struct UIEditContext;
class UINpcEditDialogWnd : public UIFrameWnd {
public:
@ -24,7 +23,6 @@ public:
/* 00B8 */ int unknown_00B8;
protected:
UIEditContext* m_editContext;
};
class UINpcTextEditDialogWnd : public UINpcEditDialogWnd {

2
Source/UI/Dialogs/UIPasswordWnd.h
View file

@ -6,7 +6,6 @@
class UIButton;
class UIEditCtrl;
class UIStaticText;
struct UIEditContext;
class UIItemDropCntWnd : public UIFrameWnd {
public:
@ -50,7 +49,6 @@ public:
protected:
void* unknown_controls;
UIEditContext* m_editContext;
};
class UIStorePasswordInputWnd : public UIFrameWnd {

4
Source/UI/Dialogs/UIProhibitListWnd.h
View file

@ -3,11 +3,10 @@
#include "UI/Window/UIFrameWnd.h"
struct UIEditContext;
class UIProhibitListWnd : public UIFrameWnd {
public:
UIProhibitListWnd(UIWindowContext& windows, UIEditContext& edits);
UIProhibitListWnd(UIWindowContext& windows);
/* 00B4 */ int m_count;
/* 00B8 */ std::uint32_t m_aid;
@ -18,7 +17,6 @@ public:
protected:
void* unknown_controls;
UIEditContext* m_edits;
};
#endif

2
Source/UI/Dialogs/UITipboxWnd.h
View file

@ -12,7 +12,6 @@ class UIEditCtrl;
class UIListBoxID;
class UITagTextViewer;
class UIBitmapButton;
struct UIEditContext;
struct TipBoxAnimation {
/* 0000 */ std::uint32_t moveStart;
@ -70,7 +69,6 @@ public:
protected:
void* unknown_controls;
UIEditContext* m_editContext;
};
#if defined(_WIN32) && !defined(_WIN64)

5
Source/UI/Edit/UIEditBoxEx.cpp
View file

@ -659,9 +659,8 @@ void CUIEditCtrlEx::SetText(const char* value) {
// OFFSET: 0x009E4410
// FUNCTION: fn_14432
void CUIEditBoxEx::Create(int width, int height, bool withScrollBar) {
UIEditContext& edits = this->edit->EditContext();
this->RemoveChild(this->edit, 1);
CUIEditCtrlEx* edit = new CUIEditCtrlEx(*this->m_context, edits);
CUIEditCtrlEx* edit = new CUIEditCtrlEx(*this->m_context);
this->edit = edit;
edit->SetSize(width, height);
if (withScrollBar) {
@ -764,7 +763,7 @@ void CUIEditCtrlEx::PaintTextLines() {
}
}
CUIEditCtrlEx::CUIEditCtrlEx(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl3(windows, edit) {
CUIEditCtrlEx::CUIEditCtrlEx(UIWindowContext& windows) : UIEditCtrl3(windows) {
this->normalColor = 0;
this->unknown_018C = 0;
this->unknown_0190 = 0;

5
Source/UI/Edit/UIEditBoxEx.h
View file

@ -20,7 +20,7 @@ struct EditLine {
class CUIEditCtrlEx : public UIEditCtrl3 {
public:
CUIEditCtrlEx(UIWindowContext& windows, UIEditContext& edit);
CUIEditCtrlEx(UIWindowContext& windows);
void Paint() override;
void Invalidate() override;
void SelectAll() override;
@ -36,9 +36,6 @@ public:
void ResetDragState();
void DrawCaret(int x, int y);
void PaintTextLines();
UIEditContext& EditContext() {
return *this->m_edit;
}
int LeadingBytesFitting(const std::string& text, int width);
int TrailingOffsetFitting(const std::string& text, int width);

6
Source/UI/Edit/UIEditCtrl.cpp
View file

@ -251,10 +251,10 @@ UIEditCtrl::UIEditCtrl(const UIEditCtrl& other)
// OFFSET: 0x0084FAE0
// FUNCTION: fn_10663
UIEditCtrl::UIEditCtrl(UIWindowContext& windows, UIEditContext& edit)
UIEditCtrl::UIEditCtrl(UIWindowContext& windows)
: UIWindow(windows, 0), anchor(0), cursor(0), mask(0), maximum(255), flat(1), red(255), green(255), blue(255), borderRed(0), borderGreen(0), borderBlue(0),
textColor(0), secondColor(0xFFFFFFFF), firstVisible(0), textY(0), invalidatesParent(0), disabled(0), unknown_00F0(0), topPadding(0), preserveInput(0),
m_edit(&edit) {
unknown_011C(nullptr) {
this->text.reserve(255);
}
@ -588,7 +588,7 @@ UISkillListWnd::UISkillListWnd(UIWindowContext& windows) : UIFrameWnd(windows, 0
}
// INLINED
UIEditCtrlWheel::UIEditCtrlWheel(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl(windows, edit) {
UIEditCtrlWheel::UIEditCtrlWheel(UIWindowContext& windows) : UIEditCtrl(windows) {
}
// OFFSET: 0x009701B0

39
Source/UI/Edit/UIEditCtrl.h
View file

@ -17,28 +17,13 @@ class UIItemTagButton;
struct ITEM_INFO;
class UIItemTagOnChat;
struct UIEditContext {
unsigned char& password;
const InputCharset& charset;
WindowManagerWindows& windows;
const BitmapImage& colorChip;
const int& candidateCursor;
UIWindow* const& candidateWindow;
UIWindow* const& readingWindow;
UIWindow* const& otherChatInput;
const bool& linkInputRestricted;
UIWindow* const& permittedLinkInput;
const int& screenWidth;
const int& screenHeight;
};
class UIEditCtrl : public UIWindow {
friend class UIMacroDetectorWnd;
public:
UIEditCtrl();
UIEditCtrl(const UIEditCtrl& other);
UIEditCtrl(UIWindowContext& windows, UIEditContext& edit);
UIEditCtrl(UIWindowContext& windows);
~UIEditCtrl() override;
bool Slot05() override;
void Paint() override;
@ -96,7 +81,7 @@ public:
/* 0104 */ std::string linkedText;
protected:
UIEditContext* m_edit;
void* unknown_011C;
void PaintTextWithPolicy(const std::string* placeholder, std::uint32_t placeholderColor, bool placeholderEnabled);
bool RemoveInvalidLink(std::list<UIWindow*>::iterator& entry);
void SnapLinkSelection(std::size_t prefix, std::size_t bytes);
@ -108,14 +93,14 @@ private:
class UIEditCtrlWheel : public UIEditCtrl {
public:
UIEditCtrlWheel(UIWindowContext& windows, UIEditContext& edit);
UIEditCtrlWheel(UIWindowContext& windows);
~UIEditCtrlWheel() override;
void Slot35(int value) override;
};
class UIEditCtrl2 : public UIEditCtrl {
public:
UIEditCtrl2(UIWindowContext& windows, UIEditContext& edit);
UIEditCtrl2(UIWindowContext& windows);
~UIEditCtrl2() override;
int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override;
};
@ -123,7 +108,7 @@ public:
class UIEditCtrl3 : public UIEditCtrl2 {
public:
UIEditCtrl3();
UIEditCtrl3(UIWindowContext& windows, UIEditContext& edit);
UIEditCtrl3(UIWindowContext& windows);
UIEditCtrl3(const UIEditCtrl3& other);
~UIEditCtrl3() override;
void Slot15(int width, int height) override;
@ -185,7 +170,7 @@ public:
class UIEditCtrl4 : public UIEditCtrl {
public:
UIEditCtrl4(UIWindowContext& windows, UIEditContext& edit);
UIEditCtrl4(UIWindowContext& windows);
~UIEditCtrl4() override;
void Slot23() override;
void PaintText() override;
@ -200,7 +185,7 @@ public:
class UIEditCtrl5 : public UIEditCtrl4 {
public:
UIEditCtrl5(UIWindowContext& windows, UIEditContext& edit);
UIEditCtrl5(UIWindowContext& windows);
~UIEditCtrl5() override;
int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override;
};
@ -216,7 +201,7 @@ public:
class UIChatEditCtrl : public UIEditCtrl {
public:
UIChatEditCtrl();
UIChatEditCtrl(UIWindowContext& windows, UIEditContext& edit);
UIChatEditCtrl(UIWindowContext& windows);
void Paint() override;
void Slot25(int x, int y) override;
int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override;
@ -233,7 +218,7 @@ public:
class UIEditCtrl_OldList : public UIEditCtrl {
public:
UIEditCtrl_OldList(UIWindowContext& windows, UIEditContext& edit);
UIEditCtrl_OldList(UIWindowContext& windows);
void Paint() override;
void Slot35(int value) override;
int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override;
@ -245,7 +230,7 @@ public:
class UIWhisperEditCtrl : public UIEditCtrl {
public:
UIWhisperEditCtrl(UIWindowContext& windows, UIEditContext& edit);
UIWhisperEditCtrl(UIWindowContext& windows);
void Slot23() override;
void Slot24(int retained) override;
int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override;
@ -258,7 +243,7 @@ public:
class UIEditCtrlVarId : public UIEditCtrl {
public:
// INLINED
UIEditCtrlVarId(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl(windows, edit) {}
UIEditCtrlVarId(UIWindowContext& windows) : UIEditCtrl(windows) {}
// INLINED
UIEditCtrlVarId() {}
void Slot24(int retained) override;
@ -280,7 +265,7 @@ public:
/* 007C */ UIEditCtrlVarId* fields[2];
protected:
UIEditContext* m_edit;
void* unknown_slot;
public:
/* 0084 */ int unknown_0084;

6
Source/UI/Edit/UIEditCtrl_Currency.cpp
View file

@ -2,13 +2,13 @@
// OFFSET: 0x0086D250
// FUNCTION: fn_11043
UIEditCtrl_Custom::UIEditCtrl_Custom(UIWindowContext& windows, UIEditContext& edit)
: UIEditCtrl2(windows, edit), unknown_011C(0), unknown_0120(0), unknown_0124(0), unknown_0128(0) {
UIEditCtrl_Custom::UIEditCtrl_Custom(UIWindowContext& windows)
: UIEditCtrl2(windows), unknown_011C(0), unknown_0120(0), unknown_0124(0), unknown_0128(0) {
}
// OFFSET: 0x0086D1B0
// FUNCTION: fn_11042
UIEditCtrl_Currency::UIEditCtrl_Currency(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl_Custom(windows, edit) {
UIEditCtrl_Currency::UIEditCtrl_Currency(UIWindowContext& windows) : UIEditCtrl_Custom(windows) {
this->unknown_0128 = 1;
this->formattedLength = 0;
}

4
Source/UI/Edit/UIEditCtrl_Currency.h
View file

@ -9,7 +9,7 @@
class UIEditCtrl_Custom : public UIEditCtrl2 {
public:
UIEditCtrl_Custom();
UIEditCtrl_Custom(UIWindowContext& windows, UIEditContext& edit);
UIEditCtrl_Custom(UIWindowContext& windows);
void PaintText() override;
void Synchronize() override;
void Trim() override;
@ -24,7 +24,7 @@ public:
class UIEditCtrl_Currency : public UIEditCtrl_Custom {
public:
UIEditCtrl_Currency();
UIEditCtrl_Currency(UIWindowContext& windows, UIEditContext& edit);
UIEditCtrl_Currency(UIWindowContext& windows);
void Slot19() override;
int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override;

2
Source/UI/Edit/UIEditCtrl_OldList.cpp
View file

@ -2,6 +2,6 @@
// OFFSET: 0x0084FCC0
// FUNCTION: fn_10664
UIEditCtrl_OldList::UIEditCtrl_OldList(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl(windows, edit), historyIndex(-1) {
UIEditCtrl_OldList::UIEditCtrl_OldList(UIWindowContext& windows) : UIEditCtrl(windows), historyIndex(-1) {
this->textY = 3;
}

12
Source/UI/Edit/UIEditVariants.cpp
View file

@ -23,7 +23,7 @@
// OFFSET: 0x0084F250
// FUNCTION: fn_10657
UIEditCtrl2::UIEditCtrl2(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl(windows, edit) {
UIEditCtrl2::UIEditCtrl2(UIWindowContext& windows) : UIEditCtrl(windows) {
}
// OFFSET: 0x008515E0
@ -298,7 +298,7 @@ void UIEditCtrl3::HandleInputMessage(unsigned key, std::intptr_t data) {
// OFFSET: 0x0084F570
// FUNCTION: fn_10659
UIEditCtrl3::UIEditCtrl3(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl2(windows, edit) {
UIEditCtrl3::UIEditCtrl3(UIWindowContext& windows) : UIEditCtrl2(windows) {
this->unknown_0130 = 0;
this->unknown_0134 = 0;
this->unknown_0138 = 14;
@ -753,7 +753,7 @@ int UIEditCtrl::MeasureText(const std::string& text, const int& bytes) {
// OFFSET: 0x0084F7B0
// FUNCTION: fn_10660
UIEditCtrl4::UIEditCtrl4(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl(windows, edit), placeholderColor(0xFFFFFFFFu), placeholderEnabled(0) {
UIEditCtrl4::UIEditCtrl4(UIWindowContext& windows) : UIEditCtrl(windows), placeholderColor(0xFFFFFFFFu), placeholderEnabled(0) {
}
// OFFSET: 0x00852870
@ -809,7 +809,7 @@ void UIEditCtrl4::SetPlaceholderColor(std::uint32_t color) {
// OFFSET: 0x0084F7B0
// FUNCTION: fn_10661
UIEditCtrl5::UIEditCtrl5(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl4(windows, edit) {
UIEditCtrl5::UIEditCtrl5(UIWindowContext& windows) : UIEditCtrl4(windows) {
}
// OFFSET: 0x008528F0
@ -915,7 +915,7 @@ void UIBitmapEditCtrl::SetBitmapName(const char* name) {
// OFFSET: 0x0084EE90
// FUNCTION: fn_10654
UIChatEditCtrl::UIChatEditCtrl(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl(windows, edit), unknown_0140(0), historyLimit(30) {
UIChatEditCtrl::UIChatEditCtrl(UIWindowContext& windows) : UIEditCtrl(windows), unknown_0140(0), historyLimit(30) {
this->history.reserve(this->historyLimit);
this->unknown_0144 = 0;
}
@ -1058,7 +1058,7 @@ int UIEditCtrl_OldList::SendMsg(UIWindow* sender, int message, std::intptr_t arg
void UIShowAndEditTimeCtrl::Slot15(int, int) {
for (int i = 0; i < 2; ++i) {
UIEditCtrlVarId*& field = this->fields[i];
field = new UIEditCtrlVarId(*this->m_context, *this->m_edit);
field = new UIEditCtrlVarId(*this->m_context);
field->SetSize(20, 18);
field->Background(232, 232, 232);
field->Border(192, 192, 192);

2
Source/UI/Edit/UIWhisperEditCtrl.cpp
View file

@ -2,5 +2,5 @@
// OFFSET: 0x00850890
// FUNCTION: fn_10681
UIWhisperEditCtrl::UIWhisperEditCtrl(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl(windows, edit), historyIndex(0) {
UIWhisperEditCtrl::UIWhisperEditCtrl(UIWindowContext& windows) : UIEditCtrl(windows), historyIndex(0) {
}

2
Source/UI/Emotion/UIEmotionWnd.cpp
View file

@ -47,7 +47,7 @@ void UIEmotionWnd::Slot15(int, int) {
auto* emotions = reinterpret_cast<EmotionHotkeys*>(&g_session.unknown_0FF8);
for (int i = 0; i < 10; ++i) {
UIEditCtrl2* edit = new UIEditCtrl2(*this->m_context, *reinterpret_cast<UIEditContext*>(nullptr));
UIEditCtrl2* edit = new UIEditCtrl2(*this->m_context);
this->m_edits[i] = edit;
edit->SetSize(270, 16);
edit->Move(83, y - 3);

2
Source/UI/Guild/UIGuildHelperWnd.cpp
View file

@ -271,7 +271,7 @@ int UIGuildTipWnd::SendMsg(UIWindow*, int message, std::intptr_t a1, std::intptr
// OFFSET: 0x00958070
// FUNCTION: fn_13055
void UICreateGuildWnd::Slot15(int, int) {
this->m_nameEdit = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->m_nameEdit = new UIEditCtrl(*this->m_context);
this->m_nameEdit->SetSize(124, 20);
this->m_nameEdit->Move(13, 42);
this->m_nameEdit->maximum = 23;

2
Source/UI/Guild/UIGuildHelperWnd.h
View file

@ -3,7 +3,6 @@
#include "UI/Window/UIFrameWnd.h"
struct UIEditContext;
struct GuildHelperWndInfo;
class UIBitmapButton;
class UIEditCtrl;
@ -47,7 +46,6 @@ public:
protected:
/* 00BC */ UIEditCtrl* m_nameEdit;
/* 00C0 */ int m_mode;
UIEditContext* m_editContext;
};
class UIGuildTipWnd : public UIFrameWnd {

2
Source/UI/Guild/UIGuildWnd.cpp
View file

@ -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, *reinterpret_cast<UIEditContext*>(nullptr));
this->m_bodyEdit = new UIEditCtrl3(*this->m_context);
this->m_bodyEdit->SetSize(this->geometry.width - 10, 156);
this->m_bodyEdit->invalidatesParent = 1;
this->m_bodyEdit->Move(5, 104);

2
Source/UI/Lists/UIScrollBar.cpp
View file

@ -1703,7 +1703,7 @@ void UITabControl::Configure(
this->inactiveTextColor = inactiveTextColor;
this->ClearTabs();
this->edit = new UIEditCtrl2(*this->m_context, *reinterpret_cast<UIEditContext*>(nullptr));
this->edit = new UIEditCtrl2(*this->m_context);
this->edit->SetSize(100, 19);
this->edit->Move(-100, -100);
this->AddChild(this->edit);

2
Source/UI/Lists/UITreeView.cpp
View file

@ -2,7 +2,7 @@
// OFFSET: 0x0086F180
// FUNCTION: fn_11087
UITreeView::UITreeView(UIWindowContext& windows, UIEditContext& edit) : UIWindow(windows, 0), m_edit(&edit) {
UITreeView::UITreeView(UIWindowContext& windows) : UIWindow(windows, 0) {
this->itemPadding = 5;
this->itemHeight = 20;
this->itemCount = 0;

4
Source/UI/Lists/UITreeView.h
View file

@ -9,7 +9,6 @@
class UIScrollBar;
class UIEditCtrl2;
struct UIEditContext;
class UITVBitmapButton;
class UITVTextButton;
@ -37,7 +36,7 @@ static_assert(offsetof(UITreeNode, children) == 0x180);
class UITreeView : public UIWindow {
public:
UITreeView(UIWindowContext& windows, UIEditContext& edit);
UITreeView(UIWindowContext& windows);
void Resize(int width, int height) override;
void Slot15(int width, int height) override;
void Paint() override;
@ -70,7 +69,6 @@ protected:
/* 00A8 */ int unknown_00A8;
/* 00AC */ unsigned char unknown_00AC;
UIEditContext* m_edit;
void* unknown_controls;
/* 00B0 */ int unknown_00B0;
};

6
Source/UI/Party/UIAdvenPartyBoardWnd.cpp
View file

@ -54,7 +54,7 @@ void UIAdvenPartyBoardWnd::Slot11() {
void UIAdvenPartyBoardWnd::Slot15(int, int) {
auto& owner = *this->m_board;
this->minimum = new UIEditCtrl2(*this->m_context, owner.edits);
this->minimum = new UIEditCtrl2(*this->m_context);
this->minimum->SetSize(25, 14);
this->minimum->invalidatesParent = 1;
this->minimum->maximum = 3;
@ -67,7 +67,7 @@ void UIAdvenPartyBoardWnd::Slot15(int, int) {
this->minimum->Show(1);
this->AddChild(this->minimum);
this->maximum = new UIEditCtrl2(*this->m_context, owner.edits);
this->maximum = new UIEditCtrl2(*this->m_context);
this->maximum->SetSize(25, 14);
this->maximum->invalidatesParent = 1;
this->maximum->maximum = 3;
@ -93,7 +93,7 @@ void UIAdvenPartyBoardWnd::Slot15(int, int) {
this->AddChild(job);
}
auto* memo = new UIEditCtrl5(*this->m_context, owner.edits);
auto* memo = new UIEditCtrl5(*this->m_context);
this->memo = memo;
memo->SetSize(116, 14);
memo->maximum = 150;

2
Source/UI/Party/UIAdvenPartyBoardWnd.h
View file

@ -14,7 +14,6 @@ class UIEditCtrl;
class UIJobSlotButton;
class UIComboBoxDef2Wnd;
class UIPartyInfoWnd;
struct UIEditContext;
struct UIComboBoxHeaderContext;
struct PartyRowContext;
struct ExtendedListLine;
@ -30,7 +29,6 @@ struct StopRecruitingContext;
struct WindowOrdering;
struct UIAdvenPartyBoardContext {
UIEditContext& edits;
UIComboBoxHeaderContext& combos;
PartyRowContext& rows;
AgencyRequestContext& requests;

2
Source/UI/Party/UIPartySettingWnd.h
View file

@ -5,7 +5,6 @@
#include "UI/Window/UIFrameWnd.h"
class UIEditCtrl;
struct UIEditContext;
struct WindowPlacement;
class UIPartySettingWnd : public UIFrameWnd {
@ -34,7 +33,6 @@ public:
/* 00E0 */ UIEditCtrl* m_edit;
protected:
UIEditContext* m_editContext;
};
class UIPartyInvitationToWnd : public UIPartySettingWnd {

5
Source/UI/Party/UIRegisterPartyWnd.cpp
View file

@ -93,7 +93,7 @@ void UIRegisterPartyWnd::Slot15(int, int) {
const int level = owner.playerLevel;
const auto edit = [&](int x, int value) {
auto* control = new UIEditCtrl(*this->m_context, owner.edits);
auto* control = new UIEditCtrl(*this->m_context);
control->SetSize(25, 16);
control->Move(x, 47);
control->invalidatesParent = 1;
@ -127,7 +127,7 @@ void UIRegisterPartyWnd::Slot15(int, int) {
}
label(LookupMessage(3359), 10, 121, this->geometry.width - 32);
this->memo = new UIEditCtrl(*this->m_context, owner.edits);
this->memo = new UIEditCtrl(*this->m_context);
this->memo->SetSize(139, 14);
this->memo->maximum = 24;
this->memo->TextColor(0, 0xFFFFFFFFu);
@ -220,7 +220,6 @@ void UIRegisterPartyWnd::SetInfo(CAdvenPartyInfo value) {
// INLINED
const char* UIRegisterPartyWnd::Text(UIEditCtrl& control) const {
const auto& edit = this->m_registration->edits;
return g_windowMgr.hoverWindow == &control ? g_serverLanguage->text.c_str() : control.text.c_str();
}

2
Source/UI/Party/UIRegisterPartyWnd.h
View file

@ -12,11 +12,9 @@ class UIBasicButton;
class ForbiddenWords;
struct AgencyRequestContext;
struct RegisterPartyContext;
struct UIEditContext;
struct UIComboBoxHeaderContext;
struct UIRegisterPartyContext {
UIEditContext& edits;
UIComboBoxHeaderContext& combos;
ForbiddenWords& forbidden;
AgencyRequestContext& requests;

2
Source/UI/Rodex/UIRodexComposeWnd.cpp
View file

@ -60,7 +60,7 @@ struct RodexSendMailRequest {
// OFFSET: 0x007FEF20
// FUNCTION: fn_09993
UIRodexEditCtrl3::UIRodexEditCtrl3(UIWindowContext& windows, UIEditContext& edit) : UIEditCtrl3(windows, edit) {
UIRodexEditCtrl3::UIRodexEditCtrl3(UIWindowContext& windows) : UIEditCtrl3(windows) {
}
// OFFSET: 0x007FEF80

2
Source/UI/Rodex/UIRodexComposeWnd.h
View file

@ -28,7 +28,7 @@ public:
// INLINED
UIRodexEditCtrl3() {
}
UIRodexEditCtrl3(UIWindowContext& windows, UIEditContext& edit);
UIRodexEditCtrl3(UIWindowContext& windows);
void Slot15(int width, int height) override;
void sub_855150();
};

6
Source/UI/UIChangeMaterialWnd.cpp
View file

@ -37,9 +37,9 @@
// OFFSET: 0x005E03B0
// FUNCTION: fn_03861
UIChangeMaterialWnd::UIChangeMaterialWnd(UIWindowContext& windows, UIEditContext& edits)
UIChangeMaterialWnd::UIChangeMaterialWnd(UIWindowContext& windows)
: UIFrameWnd(windows, 0), m_sortBox(nullptr), m_button(nullptr), m_resultX(168), m_resultY(131), m_resultItem(),
m_materialPos{{90, 86}, {246, 86}, {168, 222}, {168, 40}, {90, 176}, {246, 176}}, m_materials(), m_resultAmount(0), m_resultText(), m_editContext(&edits) {
m_materialPos{{90, 86}, {246, 86}, {168, 222}, {168, 40}, {90, 176}, {246, 176}}, m_materials(), m_resultAmount(0), m_resultText() {
*reinterpret_cast<int*>(reinterpret_cast<char*>(this) + 0xB4) = 0;
*reinterpret_cast<int*>(reinterpret_cast<char*>(this) + 0xB8) = 0;
}
@ -707,7 +707,7 @@ void UIChangeMaterialWnd::Slot15(int width, int height) {
close->SetId(201);
this->AddChild(close);
UIEditCtrl* edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
UIEditCtrl* edit = new UIEditCtrl(*this->m_context);
*reinterpret_cast<UIEditCtrl**>(reinterpret_cast<char*>(this) + 0xB8) = edit;
edit->SetSize(118, 13);
edit->Move(313, 262);

4
Source/UI/UIChangeMaterialWnd.h
View file

@ -11,7 +11,6 @@
#include <vector>
class UIButton;
struct UIEditContext;
struct MaterialSlotPos {
/* 0000 */ int x;
@ -61,7 +60,7 @@ public:
class UIChangeMaterialWnd : public UIFrameWnd {
public:
UIChangeMaterialWnd(UIWindowContext& windows, UIEditContext& edits);
UIChangeMaterialWnd(UIWindowContext& windows);
void Slot15(int width, int height) override;
bool Slot02() override;
void Paint() override;
@ -85,7 +84,6 @@ public:
protected:
void* unknown_controls;
UIEditContext* m_editContext;
};
class UIChangeMaterialWnd_List : public UIFrameWnd {

2
Source/UI/UIReputeWnd.cpp
View file

@ -63,7 +63,7 @@ void UIReputeWnd::Slot15(int width, int height) {
this->m_groupCombo->borderBlue = 99;
this->AddChild(this->m_groupCombo);
this->m_searchEdit = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->m_searchEdit = new UIEditCtrl(*this->m_context);
this->m_searchEdit->SetSize(200, 18);
this->m_searchEdit->Move(136, 25);
this->m_searchEdit->maximum = 20;

2
Source/UI/UIReputeWnd.h
View file

@ -13,7 +13,6 @@ class UIBitmapButton;
class UIComboBoxDefWnd;
class UIEditCtrl;
struct UIComboBoxHeaderContext;
struct UIEditContext;
class UIReputeWnd : public UIFrameWnd {
public:
@ -39,7 +38,6 @@ public:
protected:
void* unknown_controls;
UIEditContext* m_editContext;
UIComboBoxHeaderContext* m_comboContext;
};

6
Source/UI/Window/UIAccountLimitedToolWnd.cpp
View file

@ -58,7 +58,7 @@ void UIAccountLimitedToolWnd::Slot15(int, int) {
{125, 121}, {160, 121}, {268, 121}, {305, 121}, {90, 151}, {240, 151}, {285, 151},
};
for (int i = 0; i < 15; ++i) {
this->m_edits[i] = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->m_edits[i] = new UIEditCtrl(*this->m_context);
this->m_edits[i]->flat = 1;
this->m_edits[i]->disabled = 1;
this->m_edits[i]->Invalidate();
@ -366,8 +366,8 @@ int UIAccountLimitedToolWnd::SendMsg(UIWindow* sender, int message, std::intptr_
// OFFSET: 0x00946800
// FUNCTION: fn_12846
UIAccountLimitedToolWnd::UIAccountLimitedToolWnd(UIWindowContext& windows, UIEditContext& edits, UITextViewerContext& texts)
: UIFrameWnd(windows, 0), m_accountIdText(nullptr), m_viewer(nullptr), m_editContext(&edits), m_textContext(&texts) {
UIAccountLimitedToolWnd::UIAccountLimitedToolWnd(UIWindowContext& windows, UITextViewerContext& texts)
: UIFrameWnd(windows, 0), m_accountIdText(nullptr), m_viewer(nullptr), m_textContext(&texts) {
SecureZeroMemory(this->m_edits, sizeof(this->m_edits));
SecureZeroMemory(this->m_buttons, sizeof(this->m_buttons));
}

4
Source/UI/Window/UIAccountLimitedToolWnd.h
View file

@ -5,7 +5,6 @@
#include <string>
struct UIEditContext;
struct UITextViewerContext;
class UIBitmapButton;
class UIEditCtrl;
@ -14,7 +13,7 @@ class UITextViewer;
class UIAccountLimitedToolWnd : public UIFrameWnd {
public:
UIAccountLimitedToolWnd(UIWindowContext& windows, UIEditContext& edits, UITextViewerContext& texts);
UIAccountLimitedToolWnd(UIWindowContext& windows, UITextViewerContext& texts);
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;
@ -27,7 +26,6 @@ public:
protected:
void* unknown_controls;
UIEditContext* m_editContext;
UITextViewerContext* m_textContext;
};

4
Source/UI/Window/UIBank_NewWnd.h
View file

@ -4,11 +4,10 @@
#include "UI/Window/UIFrameWnd.h"
class UIEditCtrl;
struct UIEditContext;
class UIBank_NewWnd : public UIFrameWnd {
public:
UIBank_NewWnd(UIWindowContext& windows, UIEditContext& editContext);
UIBank_NewWnd(UIWindowContext& windows);
bool Slot03() override;
void Slot15(int width, int height) override;
long long AdjustAmount(int amount);
@ -24,7 +23,6 @@ protected:
/* 00D0 */ int unknown_00D0;
/* 00D4 */ UIWindow* m_loading[4];
void* unknown_controls;
UIEditContext* m_editContext;
};
#endif

2
Source/UI/Window/UIChatRoomWnd.h
View file

@ -9,7 +9,6 @@
#include <utility>
#include <vector>
struct UIEditContext;
class UIBitmapButton;
class UIChatEditCtrl;
class UIChatHisBox;
@ -51,7 +50,6 @@ public:
protected:
void* unknown_controls;
UIEditContext* m_editContext;
void* unknown_listContext;
};

4
Source/UI/Window/UICntWnd.h
View file

@ -5,11 +5,10 @@
class UIEditCtrl;
class UIStaticText;
struct UIEditContext;
class UICntWnd : public UIFrameWnd {
public:
UICntWnd(UIWindowContext& windows, UIEditContext& editContext);
UICntWnd(UIWindowContext& windows);
~UICntWnd() override;
void Slot15(int width, int height) override;
@ -21,7 +20,6 @@ protected:
/* 00B8 */ UIEditCtrl* m_edit;
/* 00BC */ UIStaticText* m_text;
void* unknown_controls;
UIEditContext* m_editContext;
};
#endif

8
Source/UI/Window/UIFrameWnd.cpp
View file

@ -616,8 +616,8 @@ UIAllyGuildAcceptWnd::UIAllyGuildAcceptWnd(UIWindowContext& windows, UIAcceptanc
// OFFSET: 0x008A3510
// FUNCTION: fn_11654
UIBank_NewWnd::UIBank_NewWnd(UIWindowContext& windows, UIEditContext& editContext)
: UIFrameWnd(windows, 0), m_amountEdit(nullptr), m_status(), m_editContext(&editContext) {
UIBank_NewWnd::UIBank_NewWnd(UIWindowContext& windows)
: UIFrameWnd(windows, 0), m_amountEdit(nullptr), m_status() {
}
// OFFSET: 0x008A35A0
@ -1091,8 +1091,8 @@ int UIChatRoomWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::
// OFFSET: 0x008A36A0
// FUNCTION: fn_11656
UICntWnd::UICntWnd(UIWindowContext& windows, UIEditContext& editContext)
: UIFrameWnd(windows, 0), m_editContext(&editContext) {
UICntWnd::UICntWnd(UIWindowContext& windows)
: UIFrameWnd(windows, 0) {
}
// OFFSET: 0x008A37F0

2
Source/UI/Window/UIHomunInfoWnd.h
View file

@ -13,7 +13,6 @@ class UIINT64BarGraph;
class UINormalMB;
class ForbiddenWords;
struct WindowResponseRecorder;
struct UIEditContext;
class UIHomunInfoWnd : public UIFrameWnd {
public:
@ -35,7 +34,6 @@ public:
protected:
void* unknown_controls;
UIEditContext* m_editContext;
WindowResponseRecorder* m_recorder;
ForbiddenWords* m_forbiddenWords;
};

2
Source/UI/Window/UILoginOTPWnd.h
View file

@ -3,7 +3,6 @@
#include "UI/Window/UIFrameWnd.h"
struct UIEditContext;
class UIEditCtrl;
class UIStaticText;
@ -23,7 +22,6 @@ public:
protected:
void* unknown_controls;
UIEditContext* m_editContext;
};
#endif

20
Source/UI/Window/UIMessageBox.cpp
View file

@ -1022,7 +1022,7 @@ void UILoginOTPWnd::Slot15(int, int) {
thread_local EncryptedName<sizeof(prefixSource), 0x793F370985ED674FULL> prefixName(prefixSource);
const std::string prefix(prefixName.Text());
this->unknown_00B4 = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->unknown_00B4 = new UIEditCtrl(*this->m_context);
this->unknown_00B4->SetSize(80, 16);
this->unknown_00B4->maximum = 8;
this->unknown_00B4->Move(99, 95);
@ -1620,7 +1620,7 @@ void UIChatRoomWnd::Slot15(int, int) {
this->resizer->SetColors(0xFFFF00FF, 0xFFFF00FF);
this->AddChild(this->resizer);
this->edit = new UIChatEditCtrl(*this->m_context, *this->m_editContext);
this->edit = new UIChatEditCtrl(*this->m_context);
this->edit->SetSize(this->geometry.width - 30, 16);
this->edit->Move(3, this->geometry.height - 18);
this->edit->maximum = 70;
@ -1905,7 +1905,7 @@ void UIReplayRECControlWnd::Slot15(int, int) {
this->fileOptions[1]->SetChecked(option119);
this->replayOption119 = option119;
UIEditCtrl* edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
UIEditCtrl* edit = new UIEditCtrl(*this->m_context);
this->window_0134 = edit;
edit->SetSize(151, 18);
edit->Move(-100, -100);
@ -1973,7 +1973,7 @@ void UISelectReplayDataWnd::Slot15(int width, int height) {
// OFFSET: 0x008B7040
// FUNCTION: fn_11752
void UITalkboxTrapInputWnd::Slot15(int, int) {
this->edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->edit = new UIEditCtrl(*this->m_context);
this->edit->SetSize(240, 16);
this->edit->Move(22, 50);
this->edit->maximum = 78;
@ -2624,7 +2624,7 @@ void UIBank_NewWnd::Slot15(int, int) {
this->AddBitmapButton(390, 93, 132, "bank\\btn_1000mil", "+ 10,000,000");
this->AddBitmapButton(389, 45, 132, "bank\\btn_max", LookupMessage(2778));
this->m_amountEdit = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->m_amountEdit = new UIEditCtrl(*this->m_context);
this->m_amountEdit->SetSize(99, 17);
this->m_amountEdit->maximum = 10;
this->m_amountEdit->Move(78, 90);
@ -2639,7 +2639,7 @@ void UIBank_NewWnd::Slot15(int, int) {
// OFFSET: 0x008AD770
// FUNCTION: fn_11739
void UICntWnd::Slot15(int, int) {
this->m_edit = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->m_edit = new UIEditCtrl(*this->m_context);
this->m_edit->SetSize(80, 16);
this->m_edit->Move(15, 22);
this->m_edit->maximum = 6;
@ -3196,8 +3196,8 @@ UISelectServerWnd::UISelectServerWnd(UIWindowContext& windows)
// OFFSET: 0x008A46E0
// FUNCTION: fn_11673
UITalkboxTrapInputWnd::UITalkboxTrapInputWnd(UIWindowContext& windows, UIEditContext& editContext)
: UIFrameWnd(windows, 0), m_editContext(&editContext) {
UITalkboxTrapInputWnd::UITalkboxTrapInputWnd(UIWindowContext& windows)
: UIFrameWnd(windows, 0) {
}
// OFFSET: 0x008A4E00
@ -3379,7 +3379,7 @@ int UILoginOTPWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::
// FUNCTION: fn_11740
void UIHomunInfoWnd::Slot15(int, int) {
this->AddCloseButton("", 0);
this->nameEdit = new UIEditCtrl2(*this->m_context, *this->m_editContext);
this->nameEdit = new UIEditCtrl2(*this->m_context);
this->nameEdit->SetSize(80, 16);
char* const name = reinterpret_cast<char*>(&g_session.unknown_5570[0x0C]);
if (std::strcmp(name, "") == 0) {
@ -3646,7 +3646,7 @@ int UIHomunInfoWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std:
// FUNCTION: fn_11747
void UIPetInfoWnd::Slot15(int, int) {
this->AddCloseButton("", 0);
this->nameEdit = new UIEditCtrl2(*this->m_context, *this->m_editContext);
this->nameEdit = new UIEditCtrl2(*this->m_context);
this->nameEdit->SetSize(80, 16);
if (std::strcmp(g_session.unknown_1018, "") == 0) {
std::sprintf(g_session.unknown_1018, g_session.GetJobName(g_session.unknown_103C, -1));

2
Source/UI/Window/UINavigationWnd.cpp
View file

@ -168,7 +168,7 @@ void UINavigationWnd::Slot15(int width, int height) {
this->unknown_00EC->AddOption(LookupMessage(0x8A0), 0);
this->unknown_00EC->AddOption(LookupMessage(0x8A1), 0);
this->m_titleBar = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->m_titleBar = new UIEditCtrl(*this->m_context);
this->m_titleBar->SetSize(226, 18);
this->m_titleBar->Move(-1000, -1000);
this->m_titleBar->maximum = 60;

2
Source/UI/Window/UINavigationWnd.h
View file

@ -18,7 +18,6 @@ class UIEditCtrl;
class UIListBoxNavi;
class UIResizer;
struct UIComboBoxHeaderContext;
struct UIEditContext;
struct WindowDialogs;
struct WindowResponseRecorder;
@ -94,7 +93,6 @@ protected:
void* unknown_controls;
void* unknown_listContext;
UIComboBoxHeaderContext* m_comboContext;
UIEditContext* m_editContext;
WindowResponseRecorder* m_recorder;
WindowDialogs* m_dialogs;
};

2
Source/UI/Window/UINewMakeCharWnd.cpp
View file

@ -377,7 +377,7 @@ void UINewMakeCharWnd::Slot15(int width, int height) {
cancelButton->SetId(0xB9);
this->AddChild(cancelButton);
this->m_nameEdit = new UIEditCtrl2(*this->m_context, *this->m_editContext);
this->m_nameEdit = new UIEditCtrl2(*this->m_context);
this->m_nameEdit->SetSize(0x82, 0x14);
this->m_nameEdit->Move(0x1B3, 0x10C);
this->m_nameEdit->maximum = 0x17;

1
Source/UI/Window/UINewMakeCharWnd.h
View file

@ -135,7 +135,6 @@ public:
/* 0364 */ int unknown_0364;
/* 0368 */ int unknown_0368;
void* unknown_controls;
UIEditContext* m_editContext;
};
#if defined(_WIN32) && !defined(_WIN64)

2
Source/UI/Window/UIPetInfoWnd.h
View file

@ -13,7 +13,6 @@ class UINormalMB;
class ForbiddenWords;
class UINoneVisibleButton;
class UIPetInfoBarGraph;
struct UIEditContext;
struct WindowResponseRecorder;
class UIPetInfoWnd : public UIFrameWnd {
@ -39,7 +38,6 @@ public:
protected:
void* unknown_controls;
UIEditContext* m_editContext;
WindowResponseRecorder* m_recorder;
ForbiddenWords* m_forbiddenWords;
};

2
Source/UI/Window/UIReplayRECControlWnd.h
View file

@ -12,7 +12,6 @@ class UICheckBox;
class UIEditCtrl;
class UIStaticBitmap;
class UIStaticText;
struct UIEditContext;
class UIReplayRECControlWnd : public UIFrameWnd {
public:
@ -68,7 +67,6 @@ public:
protected:
void* unknown_focus;
void* unknown_controls;
UIEditContext* m_editContext;
};
#endif

2
Source/UI/Window/UIRodexContentsWnd.cpp
View file

@ -358,7 +358,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, *reinterpret_cast<UIEditContext*>(nullptr));
this->m_contents = new UIRodexEditCtrl3(*this->m_context);
this->m_contents->SetSize(267, 192);
this->m_contents->invalidatesParent = 1;
this->m_contents->Move(15, 81);

2
Source/UI/Window/UISeekPartyListWnd.cpp
View file

@ -65,7 +65,7 @@ void UISeekPartyListWnd::Slot15(int width, int height) {
this->m_levelLabel->shadow = 1;
this->AddChild(this->m_levelLabel);
this->m_searchEdit = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->m_searchEdit = new UIEditCtrl(*this->m_context);
this->m_searchEdit->SetSize(0x28, 0x10);
this->m_searchEdit->Move(0x32, 0x14);
this->m_searchEdit->maximum = 5;

2
Source/UI/Window/UISeekPartyListWnd.h
View file

@ -18,7 +18,6 @@ class UIStaticText;
class UITextButton;
struct SeekPartyListWndInfo;
struct UIComboBoxHeaderContext;
struct UIEditContext;
extern std::map<int, PartyBookingEntry> g_friendRows;
@ -92,7 +91,6 @@ protected:
/* 01D0 */ SeekPartyListWndInfo* m_saved;
UIStaticText* m_footerText;
void* unknown_controls;
UIEditContext* m_editContext;
UIComboBoxHeaderContext* m_comboContext;
};

2
Source/UI/Window/UISeekPartyMBWnd.cpp
View file

@ -330,7 +330,7 @@ void UISeekPartyMBWnd::Slot15(int width, int height) {
this->CreateJobChecks();
this->m_levelEdit = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->m_levelEdit = new UIEditCtrl(*this->m_context);
this->m_levelEdit->SetSize(0x28, 0x10);
this->m_levelEdit->Move(0x32, 0x14);
this->m_levelEdit->maximum = 5;

2
Source/UI/Window/UISeekPartyMBWnd.h
View file

@ -10,7 +10,6 @@
#include <vector>
struct UIComboBoxHeaderContext;
struct UIEditContext;
struct SeekPartyMBWndInfo;
class UIBitmapButton;
class UICheckBox;
@ -60,7 +59,6 @@ protected:
void* unknown_controls;
UIStaticText* m_titleText;
UIStaticText* m_levelText;
UIEditContext* m_editContext;
UIComboBoxHeaderContext* m_comboContext;
};

8
Source/UI/Window/UISerachStoreInfoWnd.cpp
View file

@ -97,7 +97,7 @@ void UISerachStoreInfoWnd::Slot15(int width, int height) {
this->m_radios[1]->SetText(LookupMessage(0x6F3));
this->m_radios[this->unknown_00E4]->SendMsg(this, 0xD, 1, 0, 0, 0);
this->m_edits[1] = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->m_edits[1] = new UIEditCtrl(*this->m_context);
this->m_edits[1]->SetSize(0x4C, 0x10);
this->m_edits[1]->Move(100, 0x24);
this->m_edits[1]->maximum = 0x32;
@ -106,7 +106,7 @@ void UISerachStoreInfoWnd::Slot15(int width, int height) {
this->m_edits[1]->flat = 0;
this->AddChild(this->m_edits[1]);
this->m_edits[0] = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->m_edits[0] = new UIEditCtrl(*this->m_context);
this->m_edits[0]->SetSize(0x4C, 0x10);
this->m_edits[0]->Move(0xBB, 0x24);
this->m_edits[0]->maximum = 0x32;
@ -122,7 +122,7 @@ void UISerachStoreInfoWnd::Slot15(int width, int height) {
this->m_edits[0]->invalidatesParent = 1;
this->AddChild(this->m_edits[0]);
this->m_edits[2] = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->m_edits[2] = new UIEditCtrl(*this->m_context);
this->m_edits[2]->SetSize(0x4C, 0x10);
this->m_edits[2]->Move(0x113, 0x24);
this->m_edits[2]->maximum = 0x32;
@ -133,7 +133,7 @@ void UISerachStoreInfoWnd::Slot15(int width, int height) {
this->m_edits[2]->Invalidate();
this->AddChild(this->m_edits[2]);
this->m_edits[3] = new UIEditCtrl(*this->m_context, *this->m_editContext);
this->m_edits[3] = new UIEditCtrl(*this->m_context);
this->m_edits[3]->SetSize(0x4C, 0x10);
this->m_edits[3]->Move(0x16C, 0x24);
this->m_edits[3]->maximum = 0x32;

2
Source/UI/Window/UISerachStoreInfoWnd.h
View file

@ -9,7 +9,6 @@ class UIBitmapButton;
class UIEditCtrl;
class UIRadioBtn;
class UITextButton;
struct UIEditContext;
class UISerachStoreInfoWnd : public UIFrameWnd {
public:
@ -38,7 +37,6 @@ protected:
/* 00F0 */ std::string unknown_00F0;
void* unknown_controls;
UIEditContext* m_editContext;
};
#endif

4
Source/UI/Window/UITalkboxTrapInputWnd.h
View file

@ -4,7 +4,6 @@
#include "UI/Window/UIFrameWnd.h"
class UIEditCtrl;
struct UIEditContext;
struct TalkboxTrapTarget {
/* 0000 */ int unknown_0000;
@ -20,7 +19,7 @@ struct TalkboxTrapRequest {
class UITalkboxTrapInputWnd : public UIFrameWnd {
public:
UITalkboxTrapInputWnd(UIWindowContext& windows, UIEditContext& editContext);
UITalkboxTrapInputWnd(UIWindowContext& windows);
void Slot15(int width, int height) override;
void Paint() override;
@ -31,7 +30,6 @@ public:
protected:
void* unknown_controls;
UIEditContext* m_editContext;
};
#endif

2
Source/UI/Window/WindowMgrState.cpp
View file

@ -1168,7 +1168,7 @@ int WindowDialogs::RunEmailAddress() {
}
auto* window = new UIEmailAddressWnd(
this->windows, *reinterpret_cast<UIEditContext*>(nullptr)
this->windows
);
window->SetSize(280, 48);
window->Move((g_renderer->viewport.width - 640) / 2 + 185, (g_renderer->viewport.height - 480) / 2 + 180);