clank/rodecomp
1
0
Fork 0
Code Issues Wiki Activity

Maintenance: Fold alias global gl_24769 g_navigationWindow (0x14a67f4) into its evidenced owner member g_windowMgr.window_4F174. 0x14

Browse source 
Batch #10400 by ragnarok-clanker: no function's compiled code changes; checked with 13 compiled unit(s), including every includer of Source/UI/Window/UINavigationWnd.h.
This commit is contained in:
ragnarok-clanker 2026-11-03 21:51:45 +00:00
commit 5903e7603e
9 changed files with 23 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/Contents/NavigationRoute.cpp
View file

@ -720,16 +720,16 @@ bool CNavigationManager::sub_B995D0(std::string name, int type, bool flag) {
g_navigationManager.UpdateSearchResults();
if (!this->unknown_1248) {
if (g_navigationWindow == nullptr) {
if (g_windowMgr.window_4F174 == nullptr) {
g_windowMgr.EnsureWindow(203);
} else {
g_navigationWindow->SendMsg(nullptr, 6, 200, 0, 0, 0);
g_windowMgr.window_4F174->SendMsg(nullptr, 6, 200, 0, 0, 0);
if (g_windowMgr.modal != nullptr) {
static_cast<UINavigationWnd*>(g_windowMgr.modal)->RefreshWorldMapLevels();
}
}
g_windowMgr.Promote(g_navigationWindow);
g_windowMgr.Promote(g_windowMgr.window_4F174);
}
return true;
@ -1687,8 +1687,8 @@ void CNavigationManager::CancelRoute() {
this->unknown_125C = 0;
if (!this->unknown_1248) {
this->unknown_1258 = 1;
if (g_navigationWindow != nullptr) {
static_cast<UINavigationV4Wnd*>(g_navigationWindow)->RefreshLayout();
if (g_windowMgr.window_4F174 != nullptr) {
static_cast<UINavigationV4Wnd*>(g_windowMgr.window_4F174)->RefreshLayout();
}
}
g_windowMgr.SendNotice(1, reinterpret_cast<std::intptr_t>(LookupMessage(2309)), 0x62B0FF, 0, 0, 0);