diff --git a/Source/UI/Chat/UINewChatWnd.h b/Source/UI/Chat/UINewChatWnd.h index 1b47c8bc..b4689c7d 100644 --- a/Source/UI/Chat/UINewChatWnd.h +++ b/Source/UI/Chat/UINewChatWnd.h @@ -14,6 +14,7 @@ public: void Move(int x, int y) override; void Show(int visible) override; void Slot27(int x, int y) override; + void Slot31(int x, int y) override; private: /* 00BC */ int unknown_00BC; diff --git a/Source/UI/Chat/UISubChatHisWnd.cpp b/Source/UI/Chat/UISubChatHisWnd.cpp new file mode 100644 index 00000000..a7d6ff04 --- /dev/null +++ b/Source/UI/Chat/UISubChatHisWnd.cpp @@ -0,0 +1,12 @@ +#include "UI/Chat/UISubChatHisWnd.h" + +#include "UI/Chat/UINewChatWnd.h" +#include "UI/Edit/UIEditCtrl.h" +#include "UI/Window/InputFocus.h" +#include "UI/Window/UIWindowMgr.h" + +// OFFSET: 0x009312E0 + +// OFFSET: 0x009309B0 + +// OFFSET: 0x00931710 diff --git a/Source/UI/Chat/UISubChatHisWnd.h b/Source/UI/Chat/UISubChatHisWnd.h new file mode 100644 index 00000000..5d9f5cf1 --- /dev/null +++ b/Source/UI/Chat/UISubChatHisWnd.h @@ -0,0 +1,24 @@ +#ifndef RAGNAROK_SOURCE_UI_CHAT_UISUBCHATHISWND_H +#define RAGNAROK_SOURCE_UI_CHAT_UISUBCHATHISWND_H + +#include "UI/Window/UIFrameWnd.h" + +class UIEditCtrl; + +class UISubChatHisWnd : public UIFrameWnd { +public: + void Slot25(int x, int y) override; + void Slot26(int x, int y) override; + void Slot31(int x, int y) override; + +private: + /* 00B4 */ unsigned char unknown_00B4[0x34]; + /* 00E8 */ int m_inputHeight; + /* 00EC */ int m_inputWidth; + /* 00F0 */ int unknown_00F0; + /* 00F4 */ int m_index; + /* 00F8 */ unsigned char unknown_00F8[0x34]; + /* 012C */ UIEditCtrl* m_edit; +}; + +#endif diff --git a/Source/UI/Shortcuts/UIShortCutWnd.cpp b/Source/UI/Shortcuts/UIShortCutWnd.cpp index 56df14ac..6f38d498 100644 --- a/Source/UI/Shortcuts/UIShortCutWnd.cpp +++ b/Source/UI/Shortcuts/UIShortCutWnd.cpp @@ -481,6 +481,8 @@ void UINewChatWnd::Slot27(int x, int y) { } } +// OFFSET: 0x009313E0 + // OFFSET: 0x0091E960 // FUNCTION: fn_12630 void UIMemorialDunWnd::Move(int x, int y) { @@ -519,3 +521,9 @@ int UIWindowCallBtnWnd::SendMsg(UIWindow*, int message, std::intptr_t a, std::in } return 0; } + +// OFFSET: 0x009305E0 +// FUNCTION: fn_12684 +void UIWindowCallBtnWnd::Paint() { + this->ClearSurface(0xFFFF00FF); +} diff --git a/Source/UI/Window/UIBattleMsgOptionWnd.cpp b/Source/UI/Window/UIBattleMsgOptionWnd.cpp index 337f2181..b89d569c 100644 --- a/Source/UI/Window/UIBattleMsgOptionWnd.cpp +++ b/Source/UI/Window/UIBattleMsgOptionWnd.cpp @@ -55,3 +55,5 @@ UIBattleMsgOptionWnd::UIBattleMsgOptionWnd(UIWindowContext& windows, UIFrameCont this->text = LookupMessage(0x509); } + +// OFFSET: 0x009305F0 diff --git a/Source/UI/Window/UIBattleMsgOptionWnd.h b/Source/UI/Window/UIBattleMsgOptionWnd.h index 322e2e5f..5dc44822 100644 --- a/Source/UI/Window/UIBattleMsgOptionWnd.h +++ b/Source/UI/Window/UIBattleMsgOptionWnd.h @@ -11,6 +11,7 @@ class UIScrollBar; class UIBattleMsgOptionWnd : public UIFrameWnd { public: UIBattleMsgOptionWnd(UIWindowContext& windows, UIFrameContext& frames); + void Slot26(int x, int y) override; void Slot35(int delta) override; /* 00B4 */ UIScrollBar* m_scrollBar; diff --git a/Source/UI/Window/UICollectionSystemWnd.cpp b/Source/UI/Window/UICollectionSystemWnd.cpp index e1edcbdf..8e404c3f 100644 --- a/Source/UI/Window/UICollectionSystemWnd.cpp +++ b/Source/UI/Window/UICollectionSystemWnd.cpp @@ -1,5 +1,9 @@ #include "UI/Window/UICollectionSystemWnd.h" +#include "Client/Mode/ModeMgr.h" + +// OFFSET: 0x00930A40 + // OFFSET: 0x00934740 // FUNCTION: fn_12741 int CUICollectionSystemWnd::SendMsg(UIWindow*, int message, std::intptr_t a, std::intptr_t b, std::intptr_t, std::intptr_t) { diff --git a/Source/UI/Window/UICollectionSystemWnd.h b/Source/UI/Window/UICollectionSystemWnd.h index acc8f93c..f6d9571d 100644 --- a/Source/UI/Window/UICollectionSystemWnd.h +++ b/Source/UI/Window/UICollectionSystemWnd.h @@ -5,6 +5,7 @@ class CUICollectionSystemWnd : public UIFrameWnd { public: + 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; private: diff --git a/Source/UI/Window/UINavigationWnd.cpp b/Source/UI/Window/UINavigationWnd.cpp new file mode 100644 index 00000000..aacd9889 --- /dev/null +++ b/Source/UI/Window/UINavigationWnd.cpp @@ -0,0 +1,3 @@ +#include "UI/Window/UINavigationWnd.h" + +// OFFSET: 0x00931390 diff --git a/Source/UI/Window/UINavigationWnd.h b/Source/UI/Window/UINavigationWnd.h new file mode 100644 index 00000000..34605ff2 --- /dev/null +++ b/Source/UI/Window/UINavigationWnd.h @@ -0,0 +1,11 @@ +#ifndef RAGNAROK_SOURCE_UI_WINDOW_UINAVIGATIONWND_H +#define RAGNAROK_SOURCE_UI_WINDOW_UINAVIGATIONWND_H + +#include "UI/Window/UIFrameWnd.h" + +class UINavigationWnd : public UIFrameWnd { +public: + void Slot31(int x, int y) override; +}; + +#endif diff --git a/Source/UI/Window/UIRoMapWnd.cpp b/Source/UI/Window/UIRoMapWnd.cpp new file mode 100644 index 00000000..58935813 --- /dev/null +++ b/Source/UI/Window/UIRoMapWnd.cpp @@ -0,0 +1,6 @@ +#include "UI/Window/UIRoMapWnd.h" + +// OFFSET: 0x00931080 +// FUNCTION: fn_12697 +void UIRoMapWnd::Slot25(int, int) { +} diff --git a/Source/UI/Window/UIRoMapWnd.h b/Source/UI/Window/UIRoMapWnd.h new file mode 100644 index 00000000..3b235eda --- /dev/null +++ b/Source/UI/Window/UIRoMapWnd.h @@ -0,0 +1,11 @@ +#ifndef RAGNAROK_SOURCE_UI_WINDOW_UIROMAPWND_H +#define RAGNAROK_SOURCE_UI_WINDOW_UIROMAPWND_H + +#include "UI/Window/UIFrameWnd.h" + +class UIRoMapWnd : public UIFrameWnd { +public: + void Slot25(int x, int y) override; +}; + +#endif diff --git a/Source/UI/Window/UIWindowCallBtnWnd.h b/Source/UI/Window/UIWindowCallBtnWnd.h index 7e33661c..e050f9c2 100644 --- a/Source/UI/Window/UIWindowCallBtnWnd.h +++ b/Source/UI/Window/UIWindowCallBtnWnd.h @@ -5,6 +5,7 @@ class UIWindowCallBtnWnd : public UIFrameWnd { public: + 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/data/compile.json b/data/compile.json index 94133a80..983b5b0b 100644 --- a/data/compile.json +++ b/data/compile.json @@ -759,6 +759,7 @@ "Source/UI/CashShop/UICashShopWnd.cpp": 2, "Source/UI/Chat/ChatSuggestions.cpp": 2, "Source/UI/Chat/UIChatRoomTitle.cpp": 2, + "Source/UI/Chat/UISubChatHisWnd.cpp": 2, "Source/UI/Cooldowns/CooldownDrawing.cpp": 2, "Source/UI/Cooldowns/CooldownOwner.cpp": 2, "Source/UI/Cooldowns/CooldownState.cpp": 2, @@ -894,11 +895,13 @@ "Source/UI/Window/UIHotKeyWnd.cpp": 2, "Source/UI/Window/UIMessageBox.cpp": 2, "Source/UI/Window/UIMileageWnd.cpp": 2, + "Source/UI/Window/UINavigationWnd.cpp": 2, "Source/UI/Window/UINewSelectCharWnd.cpp": 2, "Source/UI/Window/UINormalMB.cpp": 2, "Source/UI/Window/UIOpenMailBoxWnd.cpp": 2, "Source/UI/Window/UIOpenRoulletteWnd.cpp": 2, "Source/UI/Window/UIResizer.cpp": 2, + "Source/UI/Window/UIRoMapWnd.cpp": 2, "Source/UI/Window/UIRoulletteWnd.cpp": 2, "Source/UI/Window/UISecondCostumeWnd.cpp": 2, "Source/UI/Window/UISeekPartyListWnd.cpp": 2,