Decompile 5 functions in Source/UI/Window/UINavigationWnd.cpp, Source/UI/Window/UINavigationWnd.h

Batch #5732 by Yommy: 0 byte-identical, 5 confirmed by peer review.

- fn_12770 UINavigationWnd::LayoutTabs: logic confirmed by peer review
- fn_12771 UINavigationWnd::RefreshHeaderTexts: logic confirmed by peer review
- fn_12772 UINavigationWnd::RefreshWorldMapMarks: logic confirmed by peer review
- fn_12773 UINavigationWnd::RefreshWorldMapSelection: logic confirmed by peer review
- fn_12774 UINavigationWnd::RefreshWorldMapLevels: logic confirmed by peer review

Peer-reviewed-by: ragnarok-clanker, willerthal
Accepted without human review: peers confirmed the logic ("same" ahead by at least 3, with 70% of the votes).
This commit is contained in:
ragnarok-clanker 2026-10-30 15:31:31 +00:00
commit 88e8edcd55
2 changed files with 139 additions and 1 deletions

View file

@ -1,6 +1,19 @@
#include "UI/Window/UINavigationWnd.h"
#include "Contents/MessageTable.h"
#include "Contents/NavigationManager.h"
#include "Render/Renderer.h"
#include "UI/Navigation/UINavigationV4Wnd.h"
#include "UI/Window/UIRoMapWnd.h"
#include <cstdio>
#include <cstring>
// GLOBAL: gl_24609
bool g_navigationMinimized;
// GLOBAL: gl_24610
int g_navigationMode;
// OFFSET: 0x00931390
// FUNCTION: fn_12702
@ -11,6 +24,112 @@ void UINavigationWnd::Slot31(int x, int y) {
this->UIFrameWnd::Slot31(x, y);
}
// OFFSET: 0x0093DAB0
// FUNCTION: fn_12770
void UINavigationWnd::LayoutTabs() {
this->m_routePanel->Move(-1000, -1000);
this->m_searchPanel->Move(-1000, -1000);
this->m_routeFooter->Move(-1000, -1000);
this->m_searchFooter->Move(-1000, -1000);
const int x = this->geometry.width - 222;
if (!g_navigationMinimized) {
UIWindow* footer;
if (g_navigationTab == 1) {
this->m_searchPanel->Move(x, 37);
this->m_searchPanel->Invalidate();
footer = this->m_searchFooter;
} else {
this->m_routePanel->Move(x, 37);
this->m_routePanel->Invalidate();
footer = this->m_routeFooter;
}
footer->Move(x, this->geometry.height - 41);
}
this->Invalidate();
}
// OFFSET: 0x0093DB80
// FUNCTION: fn_12771
void UINavigationWnd::RefreshHeaderTexts(int mode) {
if (!g_navigationMinimized) {
this->m_title = LookupMessage(0x8AD);
this->m_subtitle = LookupMessage(0x8AC);
} else if (mode == 2) {
char text[260];
char saved[260];
std::memset(text, 0, sizeof(text));
std::memset(saved, 0, sizeof(saved));
if (g_navigationManager.SavedTargetText(saved, sizeof(saved))) {
std::sprintf(text, ">>%s", saved);
} else {
std::sprintf(text, LookupMessage(0x8A9));
}
this->m_title = LookupMessage(0x8AA);
this->m_subtitle = text;
} else {
this->m_title = LookupMessage(0x8AB);
this->m_subtitle = LookupMessage(0x8AC);
}
this->Invalidate();
}
// OFFSET: 0x0093DD20
// FUNCTION: fn_12772
void UINavigationWnd::RefreshWorldMapMarks() {
g_worldViewMgr.ClearMarks();
if (g_navigationMode == 2) {
std::string name;
for (int index = 0; index < g_navigationManager.NodeCount(); ++index) {
CNavi_Link* node = g_navigationManager.GetNode(index);
if (node) {
name = node->GetInfo()->GetName();
name.append(".rsw", 4);
g_worldViewMgr.AddMark(name.c_str());
}
}
name = g_navigationManager.GetDestinationInfo()->GetName();
name.append(".rsw", 4);
g_worldViewMgr.AddMark(name.c_str());
this->Invalidate();
}
}
// OFFSET: 0x0093DED0
// FUNCTION: fn_12773
void UINavigationWnd::RefreshWorldMapSelection() {
this->Invalidate();
std::string name = g_navigationManager.GetCurrentTargetName();
if (!name.empty()) {
name.append(".rsw", 4);
g_worldViewMgr.SelectField(name.c_str());
} else {
g_worldViewMgr.ResetSelection();
}
}
// OFFSET: 0x0093DF80
// FUNCTION: fn_12774
void UINavigationWnd::RefreshWorldMapLevels() {
g_worldViewMgr.ClearLevels();
const int count = g_navigationManager.StateCount();
if (count > 0) {
std::string name;
for (int index = 0; index < count; ++index) {
int distance = 0;
name = g_navigationManager.StateMapName(index, &distance);
if (!name.empty()) {
name.append(".rsw", 4);
g_worldViewMgr.AddLevel(name.c_str(), distance);
}
}
this->Invalidate();
}
}
// OFFSET: 0x00940E20
// FUNCTION: fn_12781
void UINavigationWnd::Slot11() {

View file

@ -3,6 +3,8 @@
#include "UI/Window/UIFrameWnd.h"
#include <string>
struct NavigationWndInfo {
/* 0000 */ int x;
/* 0004 */ int y;
@ -11,13 +13,30 @@ struct NavigationWndInfo {
/* 0010 */ bool minimized;
};
extern bool g_navigationMinimized;
extern int g_navigationMode;
class UINavigationWnd : public UIFrameWnd {
public:
void Slot11() override;
void Slot31(int x, int y) override;
void LayoutTabs();
void RefreshHeaderTexts(int mode);
void RefreshWorldMapMarks();
void RefreshWorldMapSelection();
void RefreshWorldMapLevels();
protected:
/* 00B4 */ unsigned char unknown_00B4[0x70];
/* 00B4 */ unsigned char unknown_00B4[0x8];
/* 00BC */ std::string m_title;
/* 00D4 */ std::string m_subtitle;
/* 00EC */ unsigned char unknown_00EC[0x8];
/* 00F4 */ UIWindow* m_routePanel;
/* 00F8 */ UIWindow* m_searchPanel;
/* 00FC */ unsigned char unknown_00FC[0x8];
/* 0104 */ UIWindow* m_routeFooter;
/* 0108 */ UIWindow* m_searchFooter;
/* 010C */ unsigned char unknown_010C[0x18];
/* 0124 */ NavigationWndInfo* m_saved;
};