From 4092a8c832015e928b44ad5329e71707ee59af74 Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Wed, 28 Oct 2026 21:59:30 +0000 Subject: [PATCH] Decompile fn_19379 (NaviCell::GetY) Batch #1750 by ragnarok-clanker: 1 byte-identical, 0 confirmed by peer review. - fn_19379 NaviCell::GetY: byte-identical Merged automatically: every function is byte-identical to the original. --- Source/Contents/NavigationManager.h | 9 +++++++++ Source/Contents/NavigationRoute.cpp | 26 ++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/Source/Contents/NavigationManager.h b/Source/Contents/NavigationManager.h index 1055eff..13b8367 100644 --- a/Source/Contents/NavigationManager.h +++ b/Source/Contents/NavigationManager.h @@ -20,6 +20,8 @@ class GroundGeometry; struct NaviCell { /* 0000 */ int x; /* 0004 */ int y; + + int GetY() const; }; struct NaviLink { @@ -79,6 +81,9 @@ public: virtual const char* GetTitle() const; virtual NaviCell* GetCell(NaviCell* out) const; virtual CNaviInfo* GetInfo() const; + + bool HasId(const unsigned int& id) const; + bool IsNamed(const char* name) const; }; // VTABLE: vt_01778 @@ -118,6 +123,7 @@ public: std::vector::iterator LinksEnd(); int GetCellY() const; int GetIndex() const; + int GetCellX() const; CNavi_Link* FindLink(unsigned int key, bool byId); CNavi_Object* FindNpc(unsigned int key, bool byId); CNavi_Object* FindNpcAt(int cellX, int cellY); @@ -156,6 +162,8 @@ public: CNaviInfo* GetInfo(); NaviCell* GetCell(NaviCell* out); void Clear(); + void ClearAll(); + CNavi_Link* FindLink(unsigned int key, bool byId); int FindRoute(std::vector* route, bool direct, bool allowGates, bool includeObjects, bool allowWarps, int side); void ResetLinkDepths(); @@ -191,6 +199,7 @@ public: std::string DestinationTitle(); float FitToSquare(int* offsetX, int* offsetY, int width, int height, float size) const; void LoadSettings(); + bool BuildRoute(int startX, int startY, int destX, int destY, bool collectCells); void Reset(bool clearAll); void ClearRouteNodes(); void ClearNodePaths(); diff --git a/Source/Contents/NavigationRoute.cpp b/Source/Contents/NavigationRoute.cpp index a3f6ab7..35c7bec 100644 --- a/Source/Contents/NavigationRoute.cpp +++ b/Source/Contents/NavigationRoute.cpp @@ -1,6 +1,10 @@ #include "Contents/NavigationManager.h" #include "Client/Registry.h" +#include "Client/Session.h" +#include "Resource/ResourceMgr.h" +#include "UI/Window/UIWindow.h" +#include "UI/Window/UIWindowMgr.h" #include "Utility/RegistryKey.h" #include @@ -17,6 +21,28 @@ CNaviInfo* CNavigationManager::FindObject(const char* name) const { return nullptr; } +// OFFSET: 0x00B88840 + +// OFFSET: 0x00B88910 +// FUNCTION: fn_19379 +int NaviCell::GetY() const { + return this->y; +} + +// OFFSET: 0x00B88930 + +// OFFSET: 0x00B8CF70 + +// OFFSET: 0x00B8D0D0 + +// OFFSET: 0x00B8E8E0 +// FUNCTION: fn_19496 +int CNaviInfo::GetCellX() const { + return this->cellX; +} + +// OFFSET: 0x00B97750 + // OFFSET: 0x00B8D270 // FUNCTION: fn_19434 bool CNaviInfo::HasName(const char* name) const {