diff --git a/Source/UI/Buttons/UINoneVisibleButton.cpp b/Source/UI/Buttons/UINoneVisibleButton.cpp index 62c824a3..d0e7e08b 100644 --- a/Source/UI/Buttons/UINoneVisibleButton.cpp +++ b/Source/UI/Buttons/UINoneVisibleButton.cpp @@ -5,3 +5,8 @@ void UINoneVisibleButton::Paint() { this->ClearSurface(0xFFFF00FF); } + +// OFFSET: 0x0084FF80 +// FUNCTION: fn_10669 +UINoneVisibleButton::UINoneVisibleButton(UIWindowContext& windowContext, UIButtonContext& buttonContext) : UIButton(windowContext, buttonContext) { +} diff --git a/Source/UI/Buttons/UINoneVisibleButton.h b/Source/UI/Buttons/UINoneVisibleButton.h index dbbf56fc..53b52e12 100644 --- a/Source/UI/Buttons/UINoneVisibleButton.h +++ b/Source/UI/Buttons/UINoneVisibleButton.h @@ -5,6 +5,7 @@ class UINoneVisibleButton : public UIButton { public: + UINoneVisibleButton(UIWindowContext& windowContext, UIButtonContext& buttonContext); void Paint() override; }; diff --git a/Source/UI/Buttons/UIRadioBtn.cpp b/Source/UI/Buttons/UIRadioBtn.cpp index c5971794..6d72a4cb 100644 --- a/Source/UI/Buttons/UIRadioBtn.cpp +++ b/Source/UI/Buttons/UIRadioBtn.cpp @@ -86,3 +86,15 @@ void UIRadioBtn::SetText(const char* value) { this->text = value; this->Invalidate(); } + +// OFFSET: 0x0084FFE0 +// FUNCTION: fn_10670 +UIRadioBtn::UIRadioBtn(UIWindowContext& windows, UIButtonContext& controls) : UIWindow(windows, 0), m_controls(&controls) { + this->geometry.unknown_0030 = 0; + this->enabled = 1; + this->geometry.id = 215; + this->highlighted = 0; + this->value = 0; + this->fontHeight = 12; + this->textColor = 0; +} diff --git a/Source/UI/Buttons/UIRadioBtn.h b/Source/UI/Buttons/UIRadioBtn.h index 78c2b090..743f9956 100644 --- a/Source/UI/Buttons/UIRadioBtn.h +++ b/Source/UI/Buttons/UIRadioBtn.h @@ -10,15 +10,7 @@ struct UIButtonContext; class UIRadioBtn : public UIWindow { public: - __declspec(noinline) UIRadioBtn(UIWindowContext& windows, UIButtonContext& controls) : UIWindow(windows, 0), m_controls(&controls) { - this->geometry.unknown_0030 = 0; - this->enabled = 1; - this->geometry.id = 215; - this->highlighted = 0; - this->value = 0; - this->fontHeight = 12; - this->textColor = 0; - } + UIRadioBtn(UIWindowContext& windows, UIButtonContext& controls); ~UIRadioBtn() override; void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Shop/UIMerchantShopTitle.cpp b/Source/UI/Shop/UIMerchantShopTitle.cpp index 6cd06ede..4612f1c4 100644 --- a/Source/UI/Shop/UIMerchantShopTitle.cpp +++ b/Source/UI/Shop/UIMerchantShopTitle.cpp @@ -85,3 +85,10 @@ void UIMerchantShopTitle::Slot32(int, int) { g_session.unknown_1748.clear(); } } + +// OFFSET: 0x0084FE60 +// FUNCTION: fn_10667 +UIMerchantShopTitle::UIMerchantShopTitle(UIWindowContext& windows, UIButtonContext& controls, int buyingShop) + : UIWindow(windows, 0), buyingShop(buyingShop), m_controls(&controls) { + this->geometry.id = 189; +} diff --git a/Source/UI/Shop/UIMerchantShopTitle.h b/Source/UI/Shop/UIMerchantShopTitle.h index a10b0760..0334f882 100644 --- a/Source/UI/Shop/UIMerchantShopTitle.h +++ b/Source/UI/Shop/UIMerchantShopTitle.h @@ -10,6 +10,7 @@ struct UIButtonContext; class UIMerchantShopTitle : public UIWindow { public: + UIMerchantShopTitle(UIWindowContext& windows, UIButtonContext& controls, int buyingShop); void Slot15(int width, int height) override; void Paint() override; void Slot25(int x, int y) override; diff --git a/Source/UI/Text/UIBalloonText.cpp b/Source/UI/Text/UIBalloonText.cpp index 4573af99..9573ba12 100644 --- a/Source/UI/Text/UIBalloonText.cpp +++ b/Source/UI/Text/UIBalloonText.cpp @@ -58,7 +58,7 @@ namespace { // OFFSET: 0x0084E970 // FUNCTION: fn_10648 -UIBalloonText::UIBalloonText(UIWindowContext& windows, BalloonTextContext& text) +__declspec(noinline) UIBalloonText::UIBalloonText(UIWindowContext& windows, BalloonTextContext& text) : UIWindow(windows, 0), unknown_007C(0), m_fontHeight(12), m_textColor(0xFFFFFF), m_outlineColor(0), m_richText(0), m_textContext(&text) { this->geometry.unknown_0034 = 0; } @@ -306,3 +306,12 @@ void UINameBalloonText::SetIcon(const char* name, unsigned char framed) { this->Invalidate(); } + +// OFFSET: 0x0084FED0 +// FUNCTION: fn_10668 +UINameBalloonText::UINameBalloonText(UIWindowContext& windows, BalloonTextContext& text) : UIBalloonText(windows, text), monsterType(0), framed(0) { + this->m_textColor = 0xFFFFFF; + this->m_outlineColor = 0; + this->unknown_00B8 = 0; + this->unknown_0098 = 0; +} diff --git a/Source/UI/Text/UINameBalloonText.h b/Source/UI/Text/UINameBalloonText.h index fc4ce741..d1c248ed 100644 --- a/Source/UI/Text/UINameBalloonText.h +++ b/Source/UI/Text/UINameBalloonText.h @@ -7,6 +7,7 @@ class UINameBalloonText : public UIBalloonText { public: + UINameBalloonText(UIWindowContext& windows, BalloonTextContext& text); ~UINameBalloonText() override; void Slot19() override; void Paint() override; diff --git a/Source/UI/Text/UIStaticText.cpp b/Source/UI/Text/UIStaticText.cpp index 66390645..6ce6fbc7 100644 --- a/Source/UI/Text/UIStaticText.cpp +++ b/Source/UI/Text/UIStaticText.cpp @@ -7,7 +7,7 @@ // OFFSET: 0x00850550 // FUNCTION: fn_10678 -UIStaticText::UIStaticText(UIWindowContext& windows, UIButtonContext& controls) +__declspec(noinline) UIStaticText::UIStaticText(UIWindowContext& windows, UIButtonContext& controls) : UIWindow(windows, 0), red(0), green(0), blue(0), shadow(0), outline(0), background(0xFFFF00FFu), outlineColor(0x969696), fontHeight(12), fontFamily(0), bold(0), italic(0), tooltipEnabled(0), m_controls(&controls) { } @@ -366,3 +366,8 @@ void UIStaticText::SetTextWithinWidth(const char* value, int outlineValue) { } this->Invalidate(); } + +// OFFSET: 0x008504F0 +// FUNCTION: fn_10677 +UIStaticText3::UIStaticText3(UIWindowContext& windows, UIButtonContext& controls) : UIStaticText(windows, controls), textX(0) { +} diff --git a/Source/UI/Text/UIStaticText.h b/Source/UI/Text/UIStaticText.h index 1f83b95d..66306d1f 100644 --- a/Source/UI/Text/UIStaticText.h +++ b/Source/UI/Text/UIStaticText.h @@ -58,6 +58,7 @@ public: class UIStaticText3 : public UIStaticText { public: + UIStaticText3(UIWindowContext& windows, UIButtonContext& controls); void Paint() override; /* 00D8 */ int textX; diff --git a/Source/UI/UISlotBitmap.cpp b/Source/UI/UISlotBitmap.cpp index 719b7327..20dd372a 100644 --- a/Source/UI/UISlotBitmap.cpp +++ b/Source/UI/UISlotBitmap.cpp @@ -61,3 +61,19 @@ int UISlotBitmap::SendMsg(UIWindow* sender, int message, std::intptr_t argument1 return UIStaticBitmap::SendMsg(sender, message, argument1, argument2, argument3, argument4); } } + +// OFFSET: 0x008501D0 +// FUNCTION: fn_10672 +UISlotBitmap::UISlotBitmap(UIWindowContext& windows, UIButtonContext& controls, int slot) : UIStaticBitmap(windows, controls) { + this->slot = slot; + this->unknown_00B8 = 0; + this->addButton = nullptr; +} + +// OFFSET: 0x00850240 +// FUNCTION: fn_10673 +UISlotBitmap::UISlotBitmap(UIWindowContext& windows, UIButtonContext& controls, int slot, unsigned char flag) : UIStaticBitmap(windows, controls) { + this->slot = slot; + this->unknown_00B8 = flag; + this->addButton = nullptr; +} diff --git a/Source/UI/UISlotBitmap.h b/Source/UI/UISlotBitmap.h index faa778f0..e19b9c3d 100644 --- a/Source/UI/UISlotBitmap.h +++ b/Source/UI/UISlotBitmap.h @@ -7,6 +7,8 @@ class UIBitmapButton; class UISlotBitmap : public UIStaticBitmap { public: + UISlotBitmap(UIWindowContext& windows, UIButtonContext& controls, int slot); + UISlotBitmap(UIWindowContext& windows, UIButtonContext& controls, int slot, unsigned char flag); void Slot15(int width, int height) override; void Slot25(int x, int y) override; void Slot26(int x, int y) override; diff --git a/Source/UI/Window/UIEmblemWnd.cpp b/Source/UI/Window/UIEmblemWnd.cpp index 36f68ec7..385b1d50 100644 --- a/Source/UI/Window/UIEmblemWnd.cpp +++ b/Source/UI/Window/UIEmblemWnd.cpp @@ -82,3 +82,9 @@ int UIEmblemWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argument1, return 0; } + +// OFFSET: 0x0084FD80 +// FUNCTION: fn_10665 +UIEmblemWnd::UIEmblemWnd(UIWindowContext& windows) : UIWindow(windows, 0), aid(0), guildId(0) { + this->SetSize(24, 24); +} diff --git a/Source/UI/Window/UIEmblemWnd.h b/Source/UI/Window/UIEmblemWnd.h index 906a42f0..f47da20e 100644 --- a/Source/UI/Window/UIEmblemWnd.h +++ b/Source/UI/Window/UIEmblemWnd.h @@ -8,6 +8,7 @@ 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/UIResizer.cpp b/Source/UI/Window/UIResizer.cpp index 6441d399..2c06264e 100644 --- a/Source/UI/Window/UIResizer.cpp +++ b/Source/UI/Window/UIResizer.cpp @@ -135,3 +135,9 @@ void UIResizer::Slot31(int, int) { void UIResizer::SetDirection(int value) { this->direction = value; } + +// OFFSET: 0x00850120 +// FUNCTION: fn_10671 +UIResizer::UIResizer(UIWindowContext& windows) + : UIWindow(windows, 0), direction(0), parentWidth(0), parentHeight(0), lineColor(0xFFFF00FF), backgroundColor(0xFFFF00FF) { +} diff --git a/Source/UI/Window/UITab.cpp b/Source/UI/Window/UITab.cpp index 93728612..843decf4 100644 --- a/Source/UI/Window/UITab.cpp +++ b/Source/UI/Window/UITab.cpp @@ -59,3 +59,11 @@ int UITab::SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std:: return 0; } + +// OFFSET: 0x00850680 +// FUNCTION: fn_10679 +UITab::UITab(UIWindowContext& context) : UIWindow(context, 0) { + this->geometry.unknown_0030 = 0; + this->tabCount = 3; + this->style = 0; +} diff --git a/Source/UI/Window/UITab.h b/Source/UI/Window/UITab.h index bf0ad478..1e2152a5 100644 --- a/Source/UI/Window/UITab.h +++ b/Source/UI/Window/UITab.h @@ -5,9 +5,7 @@ class UITab : public UIWindow { public: - explicit UITab(UIWindowContext& context) : UIWindow(context, 0), tabCount(3), style(0) { - this->geometry.unknown_0030 = 0; - } + explicit UITab(UIWindowContext& context); void Paint() override; void Slot25(int x, int y) 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/UIWordDisplayWnd.cpp b/Source/UI/Window/UIWordDisplayWnd.cpp index 4a52f661..21e4c4d6 100644 --- a/Source/UI/Window/UIWordDisplayWnd.cpp +++ b/Source/UI/Window/UIWordDisplayWnd.cpp @@ -56,3 +56,10 @@ int UIWordDisplayWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argum return 0; } + +// OFFSET: 0x00850910 +// FUNCTION: fn_10682 +UIWordDisplayWnd::UIWordDisplayWnd(UIWindowContext& windowContext, UIFrameContext& frameContext) : UIFrameWnd(windowContext, frameContext, 0), aid(0) { + this->text.clear(); + this->SetSize(24, 24); +} diff --git a/Source/UI/Window/UIWordDisplayWnd.h b/Source/UI/Window/UIWordDisplayWnd.h index 79f4c0e7..0368f064 100644 --- a/Source/UI/Window/UIWordDisplayWnd.h +++ b/Source/UI/Window/UIWordDisplayWnd.h @@ -8,6 +8,7 @@ class UIWordDisplayWnd : public UIFrameWnd { public: + UIWordDisplayWnd(UIWindowContext& windowContext, UIFrameContext& frameContext); void Slot15(int width, int height) override; void Slot19() override; void Paint() override;