Maintenance: Aliased globals, CNavigationManager group: 25 GLOBAL IDs (gl_24608..gl_24626, gl_24632, gl_24967, gl_25081, gl_25082, gl
Batch #14697 by ragnarok-clanker: no function's compiled code changes; checked with 21 compiled unit(s), including every includer of Source/UI/Navigation/UINavigationV4Wnd.h, Source/UI/Window/UINavigationWnd.h.
This commit is contained in:
parent
aee1eb4cf2
commit
a2984f2ce7
9 changed files with 116 additions and 211 deletions
|
|
@ -2548,10 +2548,10 @@ bool UIWindowMgr::ProcessHotkeyAction(int action, int pressed) {
|
|||
if (this->CloseWindow(id) == true) {
|
||||
return false;
|
||||
}
|
||||
} else if (g_navigationMode == 2) {
|
||||
} else if (g_navigationManager.unknown_1258 == 2) {
|
||||
if (g_windowMgr.Confirm(LookupMessage(0x8BF), 2, true, false, 0, "Message", 280, 120, 0) == 187) {
|
||||
g_navigationTab = 0;
|
||||
g_navigationMinimized = false;
|
||||
g_navigationManager.unknown_125C = 0;
|
||||
g_navigationManager.unknown_1254 = false;
|
||||
g_navigationManager.Reset(true);
|
||||
g_worldViewMgr.ClearMarks();
|
||||
g_worldViewMgr.ClearLevels();
|
||||
|
|
@ -3734,7 +3734,7 @@ bool UIWindowMgr::CloseWindow(int id) {
|
|||
this->modal = nullptr;
|
||||
closed = true;
|
||||
if (this->window_4F174) {
|
||||
g_navigationHidden = false;
|
||||
g_navigationManager.unknown_1248 = false;
|
||||
static_cast<UINavigationV4Wnd*>(this->window_4F174)->RefreshLayout();
|
||||
}
|
||||
}
|
||||
|
|
@ -6395,7 +6395,7 @@ UIWindow* UIWindowMgr::EnsureWindow(int id) {
|
|||
case 203:
|
||||
if (this->window_4F174 == nullptr) {
|
||||
this->RecordWindowPacket(203);
|
||||
g_navigationHidden = false;
|
||||
g_navigationManager.unknown_1248 = false;
|
||||
window = new UINavigationV4Wnd();
|
||||
this->window_4F174 = window;
|
||||
window->SetSize(272, 338);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue