clank/rodecomp
1
0
Fork 0
Code Issues Wiki Activity

Decompile 4 functions in Source/Contents/NavigationRequest.cpp

Browse source 
Batch #16150 by youko: 0 byte-identical, 4 confirmed by peer review.

- fn_19465 CNaviInfo::FindMatchingLink: logic confirmed by peer review
- fn_19500 CNaviInfo::CollectTargets: logic confirmed by peer review
- fn_19501 CNaviInfo::CollectMobsInRange: logic confirmed by peer review
- fn_19505 CNaviInfo::CollectMobsByTitle: logic confirmed by peer review

Peer-reviewed-by: Yommy, kyoshi, Toshiro
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-11-10 15:35:36 +00:00
commit 62c8b00eb5
1 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Source/Contents/NavigationRequest.cpp
View file

@ -321,11 +321,9 @@ std::vector<CNavi_Object*>* CNaviInfo::Npcs() {
return &this->npcs;
}
// OFFSET: 0x00B8E010
// FUNCTION: fn_19465
CNavi_Link* CNaviInfo::FindMatchingLink(CNavi_Link link) {
const CNavi_Link target = link;
for (CNavi_Link* candidate : this->links) {
// INLINED
static CNavi_Link* FindSameLink(const std::vector<CNavi_Link*>& links, CNavi_Link target) {
for (CNavi_Link* candidate : links) {
if (candidate->cellX == target.cellX && candidate->cellY == target.cellY && candidate->linkedCellX == target.linkedCellX &&
candidate->linkedCellY == target.linkedCellY && candidate->info != nullptr &&
std::strcmp(candidate->info->name.c_str(), target.info->name.c_str()) == 0 && candidate->linkedInfo != nullptr &&
@ -336,6 +334,12 @@ CNavi_Link* CNaviInfo::FindMatchingLink(CNavi_Link link) {
return nullptr;
}
// OFFSET: 0x00B8E010
// FUNCTION: fn_19465
CNavi_Link* CNaviInfo::FindMatchingLink(CNavi_Link link) {
return FindSameLink(this->links, link);
}
// OFFSET: 0x00B8D6F0
// FUNCTION: fn_19435
bool NavigationTarget::operator>(const NavigationTarget& other) const {
@ -417,26 +421,28 @@ void CNaviInfo::CollectTargets(int type, std::vector<NavigationTarget>& out) {
if (type == 2 || type == 0) {
target.type = 2;
for (CNavi_Object* npc : this->npcs) {
const std::vector<CNavi_Object*>::iterator end = this->npcs.end();
for (std::vector<CNavi_Object*>::iterator it = this->npcs.begin(); it != end; ++it) {
NaviCell cell;
const NaviCell* position = npc->GetCell(&cell);
const NaviCell* position = (*it)->GetCell(&cell);
target.x = position->x;
target.y = position->y;
target.name = npc->GetName();
target.object = npc;
target.name = (*it)->GetName();
target.object = *it;
out.push_back(target);
}
}
if (type == 3 || type == 0) {
target.type = 3;
for (CNavi_Object* mob : this->mobs) {
const std::vector<CNavi_Object*>::iterator end = this->mobs.end();
for (std::vector<CNavi_Object*>::iterator it = this->mobs.begin(); it != end; ++it) {
NaviCell cell;
const NaviCell* position = mob->GetCell(&cell);
const NaviCell* position = (*it)->GetCell(&cell);
target.x = position->x;
target.y = position->y;
target.name = mob->GetName();
target.object = mob;
target.name = (*it)->GetName();
target.object = *it;
out.push_back(target);
}
}
@ -446,16 +452,17 @@ void CNaviInfo::CollectTargets(int type, std::vector<NavigationTarget>& out) {
// FUNCTION: fn_19501
void CNaviInfo::CollectMobsInRange(int minimum, int maximum, std::vector<NavigationTarget>& out) {
NavigationTarget target(3, nullptr);
for (CNavi_Object* mob : this->mobs) {
const std::vector<CNavi_Object*>::iterator end = this->mobs.end();
for (std::vector<CNavi_Object*>::iterator it = this->mobs.begin(); it != end; ++it) {
NaviCell lower;
NaviCell upper;
if (minimum <= mob->GetCell(&lower)->x && mob->GetCell(&upper)->x <= maximum) {
if (minimum <= (*it)->GetCell(&lower)->x && maximum >= (*it)->GetCell(&upper)->x) {
NaviCell cell;
const NaviCell* position = mob->GetCell(&cell);
const NaviCell* position = (*it)->GetCell(&cell);
target.x = position->x;
target.y = position->y;
target.name = mob->GetName();
target.object = mob;
target.name = (*it)->GetName();
target.object = *it;
out.push_back(target);
}
}
@ -465,14 +472,14 @@ void CNaviInfo::CollectMobsInRange(int minimum, int maximum, std::vector<Navigat
// FUNCTION: fn_19505
void CNaviInfo::CollectMobsByTitle(std::string title, std::vector<NavigationTarget>& out) {
NavigationTarget target(3, nullptr);
for (CNavi_Object* mob : this->mobs) {
if (std::strcmp(mob->GetTitle(), title.c_str()) == 0) {
for (std::vector<CNavi_Object*>::iterator it = this->mobs.begin(); it != this->mobs.end(); ++it) {
if (std::strcmp((*it)->GetTitle(), title.c_str()) == 0) {
NaviCell cell;
const NaviCell* position = mob->GetCell(&cell);
const NaviCell* position = (*it)->GetCell(&cell);
target.x = position->x;
target.y = position->y;
target.name = mob->GetName();
target.object = mob;
target.name = (*it)->GetName();
target.object = *it;
out.push_back(target);
}
}