clank/rodecomp
1
0
Fork 0
Code Issues Wiki Activity

Maintenance: [forced, user-approved] Family G13a: remove UIBookContext and UIRequestJoinPartyContext. UIBookWnd ctor 0x8C6FA0 and UIR

Browse source 
Batch #10215 by ragnarok-clanker: forced by an admin (1 lower score(s), 4 changed function(s)); checked with 2 compiled unit(s), including every includer of Source/UI/Dialogs/UIBookWnd.h, Source/UI/Party/UIRequestJoinPartyWnd.h.
This commit is contained in:
ragnarok-clanker 2026-11-02 23:48:06 +00:00
commit 4ff2f81567
4 changed files with 10 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -216,8 +216,8 @@ UIChooseSellBuyWnd::UIChooseSellBuyWnd(UIWindowContext& windows, UIAcceptanceCon
// OFFSET: 0x008C6FA0 // OFFSET: 0x008C6FA0
// FUNCTION: fn_11926 // FUNCTION: fn_11926
UIBookWnd::UIBookWnd(UIWindowContext& windows, UIBookContext& book) UIBookWnd::UIBookWnd(UIWindowContext& windows)
: UIFrameWnd(windows, 0), m_book(&book) { : UIFrameWnd(windows, 0) {
this->m_lineCount = 0; this->m_lineCount = 0;
this->m_pageCount = 0; this->m_pageCount = 0;
this->m_page = 1; this->m_page = 1;
@ -3500,7 +3500,7 @@ int UIBookWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intp
} }
} }
this->Invalidate(); this->Invalidate();
this->m_book->ordering.Promote(this); reinterpret_cast<WindowOrdering&>(g_windowMgr).Promote(this);
break; break;
} }

11
Source/UI/Dialogs/UIBookWnd.h
View file

@ -9,16 +9,10 @@
class UISpriteButton; class UISpriteButton;
class UITextViewer; class UITextViewer;
struct WindowOrdering;
struct UIBookContext {
void* unknown_text;
WindowOrdering& ordering;
};
class UIBookWnd : public UIFrameWnd { class UIBookWnd : public UIFrameWnd {
public: public:
UIBookWnd(UIWindowContext& windows, UIBookContext& book); UIBookWnd(UIWindowContext& windows);
/* 00B4 */ UITextViewer* m_viewer; /* 00B4 */ UITextViewer* m_viewer;
/* 00B8 */ UIWindow* unknown_00B8; /* 00B8 */ UIWindow* unknown_00B8;
/* 00BC */ char m_bookName[100]; /* 00BC */ char m_bookName[100];
@ -42,9 +36,6 @@ public:
int LoadBookmark(const char* name); int LoadBookmark(const char* name);
char* StripColorCodes(const char* text); char* StripColorCodes(const char* text);
protected:
UIBookContext* m_book;
}; };
extern const char* g_bookmarkKeySuffix; extern const char* g_bookmarkKeySuffix;

8
Source/UI/Party/UIRequestJoinPartyWnd.cpp
View file

@ -24,8 +24,8 @@ namespace {
// OFFSET: 0x007BB030 // OFFSET: 0x007BB030
// FUNCTION: fn_09280 // FUNCTION: fn_09280
UIRequestJoinPartyWnd::UIRequestJoinPartyWnd(UIWindowContext& windows, UIRequestJoinPartyContext& request) UIRequestJoinPartyWnd::UIRequestJoinPartyWnd(UIWindowContext& windows)
: UIFrameWnd(windows, 0), m_request(&request) { : UIFrameWnd(windows, 0) {
} }
// OFFSET: 0x007BB960 // OFFSET: 0x007BB960
@ -160,11 +160,11 @@ int UIRequestJoinPartyWnd::SendMsg(UIWindow* sender, int message, std::intptr_t
} }
if (value == 542 && this->block->geometry.unknown_0030 != 0) { if (value == 542 && this->block->geometry.unknown_0030 != 0) {
this->m_request->requests.Block(this->accountId); g_requestJoinPartyMgr->Block(this->accountId);
} }
static_cast<CMode*>(g_charViewMode)->SendMsg(264, this->characterId, value == 541, reinterpret_cast<std::intptr_t>(&this->accountId), 0); static_cast<CMode*>(g_charViewMode)->SendMsg(264, this->characterId, value == 541, reinterpret_cast<std::intptr_t>(&this->accountId), 0);
this->m_request->requests.Advance(); g_requestJoinPartyMgr->Advance();
this->block->SetChecked(0); this->block->SetChecked(0);
return 0; return 0;

12
Source/UI/Party/UIRequestJoinPartyWnd.h
View file

@ -10,16 +10,11 @@ class UICheckBox;
class UIStaticText; class UIStaticText;
class UIBitmapButton; class UIBitmapButton;
struct PartyJoinRequest; struct PartyJoinRequest;
class UIRequestJoinPartyMgr;
struct UIRequestJoinPartyContext {
void* unknown_text;
UIRequestJoinPartyMgr& requests;
};
class UIRequestJoinPartyWnd : public UIFrameWnd { class UIRequestJoinPartyWnd : public UIFrameWnd {
public: public:
UIRequestJoinPartyWnd(UIWindowContext& windows, UIRequestJoinPartyContext& request); UIRequestJoinPartyWnd(UIWindowContext& windows);
~UIRequestJoinPartyWnd() override; ~UIRequestJoinPartyWnd() override;
void Slot15(int width, int height) override; void Slot15(int width, int height) override;
void Paint() override; void Paint() override;
@ -40,13 +35,10 @@ public:
/* 00E2 */ std::int16_t level; /* 00E2 */ std::int16_t level;
/* 00E4 */ UIBitmapButton* icon; /* 00E4 */ UIBitmapButton* icon;
/* 00E8 */ UIStaticText* levelText; /* 00E8 */ UIStaticText* levelText;
private:
UIRequestJoinPartyContext* m_request;
}; };
#if defined(_WIN32) && !defined(_WIN64) #if defined(_WIN32) && !defined(_WIN64)
static_assert(sizeof(UIRequestJoinPartyWnd) == 248); static_assert(sizeof(UIRequestJoinPartyWnd) == 244);
#endif #endif
#endif #endif