clank/rodecomp
1
0
Fork 0
Code Issues Wiki Activity

Maintenance: [forced, user-approved] Family G5: remove invented UIWaitDBSaveWndContext (WindowManagerWindows& windows), its ctor para

Browse source 
Batch #10198 by ragnarok-clanker: forced by an admin (1 lower score(s), 3 changed function(s)); checked with 490 compiled unit(s), including every includer of Source/UI/Dialogs/UIWaitDBSaveWnd.h, Source/UI/Window/UIWindowMgr.h.
This commit is contained in:
ragnarok-clanker 2026-11-02 21:38:44 +00:00
commit 3152f84a20
4 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,9 +51,9 @@ private:
// OFFSET: 0x00AB49D0
// FUNCTION: fn_17446
UIWaitDBSaveWnd::UIWaitDBSaveWnd(UIWindowContext& windowContext, UIWaitDBSaveWndContext& waitContext)
UIWaitDBSaveWnd::UIWaitDBSaveWnd(UIWindowContext& windowContext)
: UIWindow(windowContext, 0), m_animation(0), m_frame(0), m_loopLimit(0), m_sprite(nullptr), m_action(nullptr), m_startTime(0), m_loop(1),
m_closeTime(0), m_waitContext(waitContext) {
m_closeTime(0) {
const std::uint8_t actionSource[] = {0x36, 0xCE, 0xE6, 0x4D, 0xCF, 0x8B, 0xAC, 0x76, 0x17, 0xCA, 0xD3, 0x77, 0xE4,
0xBE, 0xB3, 0x78, 0x00, 0xCB, 0xE6, 0x57, 0xEC, 0xE7, 0x9E, 0x74, 0x15, 0xAF};
thread_local EncryptedName<sizeof(actionSource), 0x17FFC98B398FAF61ULL> actionName(actionSource);
@ -146,7 +146,7 @@ void UIWaitDBSaveWnd::Slot27(int, int) {
void UIWaitDBSaveWnd::Slot19() {
if (this->m_closeTime != 0 && timeGetTime() >= this->m_closeTime) {
this->m_closeTime = 0;
this->m_waitContext.windows.CloseWindow(10024);
g_windowMgr.CloseWindow(10024);
return;
}

8
Source/UI/Dialogs/UIWaitDBSaveWnd.h
View file

@ -7,15 +7,10 @@
class CActRes;
class CSprRes;
#include "UI/Window/WindowManagerWindows.h"
struct UIWaitDBSaveWndContext {
WindowManagerWindows& windows;
};
class UIWaitDBSaveWnd : public UIWindow {
public:
UIWaitDBSaveWnd(UIWindowContext& windowContext, UIWaitDBSaveWndContext& waitContext);
UIWaitDBSaveWnd(UIWindowContext& windowContext);
void Slot15(int width, int height) override;
void Slot18() override;
void Slot19() override;
@ -30,7 +25,6 @@ public:
/* 0090 */ std::uint32_t m_startTime;
/* 0094 */ unsigned int m_loop;
/* 0098 */ std::uint32_t m_closeTime;
UIWaitDBSaveWndContext m_waitContext;
};
#endif

3
Source/UI/Window/UIWindowMgr.cpp
View file

@ -3946,8 +3946,7 @@ void UIWindowMgr::ShowWaitDBSaveWindow() {
}
WindowDialogs& dialogs = *reinterpret_cast<WindowDialogs*>(this);
UIWaitDBSaveWndContext waitContext{*reinterpret_cast<WindowManagerWindows*>(this)};
this->window_4F2AC = new UIWaitDBSaveWnd(dialogs.windows, waitContext);
this->window_4F2AC = new UIWaitDBSaveWnd(dialogs.windows);
this->window_4F2AC->SetSize(g_renderer->viewport.width, g_renderer->viewport.height);
this->window_4F2AC->Move(0, 0);
this->window_4F2AC->SetId(10024);

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

@ -21,7 +21,6 @@ class CWebBrowser;
struct MessengerMember;
struct ReplayOptions;
struct ModeDragState;
struct UIWaitDBSaveWndContext;
struct UIWindowContext;
struct WindowTextEntry {