Decompile 17 functions in Source/Resource/ResourceMgr.h, Source/Resource/ResourceAliases.h, ...
Batch #16281 by kyoshi: 4 byte-identical, 13 confirmed by peer review. - fn_19603 CNavigationManager::MapCellToView: byte-identical - fn_18180 ResourceMgr::Resolve: logic confirmed by peer review - fn_18187 ResourceMgr::LoadAliases: logic confirmed by peer review - fn_18169 ResourceMgr::~ResourceMgr: logic confirmed by peer review (already on main) - fn_18173 ResourceMgr::FindType: byte-identical - fn_18176 ResourceMgr::Load: logic confirmed by peer review (already on main) - fn_18181 ResourceMgr::Exists: logic confirmed by peer review (already on main) - fn_18188 ResourceMgr::Register: logic confirmed by peer review (already on main) - fn_18189 ResourceMgr::UnloadAll: byte-identical (already on main) - fn_18190 ResourceMgr::Remove: logic confirmed by peer review (already on main) - fn_18191 ResourceMgr::ClearExpired: logic confirmed by peer review (already on main) - fn_18192 ResourceMgr::ClearUnused: logic confirmed by peer review (already on main) - fn_18193 ResourceMgr::ClearUnused: logic confirmed by peer review (already on main) - fn_18209 ResourceMgr::Instance: logic confirmed by peer review (already on main) - fn_18175 ResourceMgr::Load: logic confirmed by peer review (already on main) - fn_18182 ResourceMgr::Exists: logic confirmed by peer review (already on main) - fn_18186 ResourceMgr::UpdateTransient: byte-identical (already on main) Peer-reviewed-by: Yommy, youko Accepted without human review: peers confirmed the logic ("same" ahead by at least 3, with 70% of the votes).
This commit is contained in:
parent
c3258abb9f
commit
c6b30f7758
9 changed files with 49 additions and 47 deletions
|
|
@ -213,7 +213,7 @@ bool CNavigationManager::BuildRoute(int startX, int startY, int destX, int destY
|
|||
|
||||
CNaviInfo* info = this->FindObject(g_session.m_navigationPlayerMap);
|
||||
if (info == nullptr) {
|
||||
const std::string resolved = ResourceMgr::Instance().aliases.ResolveMapName(g_session.m_navigationPlayerMap);
|
||||
const std::string resolved = ResourceMgr::Instance().ResolveMapName(g_session.m_navigationPlayerMap);
|
||||
info = this->FindObject(resolved.c_str());
|
||||
if (info == nullptr) {
|
||||
return found;
|
||||
|
|
@ -288,7 +288,7 @@ void CNavigationManager::RequestPrivateAirship(std::string mapName, int itemId)
|
|||
NaviCell* CNavigationManager::MapCellToView(NaviCell* out, const char* mapName, int cellX, int cellY, float size) {
|
||||
CNaviInfo* info = this->FindObject(mapName);
|
||||
if (info == nullptr) {
|
||||
const std::string resolved = ResourceMgr::Instance().aliases.ResolveMapName(mapName);
|
||||
const std::string resolved = ResourceMgr::Instance().ResolveMapName(mapName);
|
||||
info = this->FindObject(resolved.c_str());
|
||||
}
|
||||
|
||||
|
|
@ -629,7 +629,7 @@ bool CNavigationManager::StartNavigation(std::string name, int type, unsigned ch
|
|||
|
||||
CNaviInfo* info = this->FindObject(name.c_str());
|
||||
if (!info) {
|
||||
const std::string resolved = ResourceMgr::Instance().aliases.ResolveMapName(name.c_str());
|
||||
const std::string resolved = ResourceMgr::Instance().ResolveMapName(name.c_str());
|
||||
info = this->FindObject(resolved.c_str());
|
||||
if (!info) {
|
||||
return false;
|
||||
|
|
@ -1633,7 +1633,7 @@ bool CNavigationManager::RouteToSavedTarget(int cellX, int cellY) {
|
|||
x = cellX;
|
||||
y = cellY;
|
||||
std::string name(info->GetName());
|
||||
name = ResourceMgr::Instance().aliases.ResolveMapName(name.c_str());
|
||||
name = ResourceMgr::Instance().ResolveMapName(name.c_str());
|
||||
if (!this->pathFinder.LoadAttr(name) || !this->pathFinder.Walkable(cellX, cellY)) {
|
||||
return false;
|
||||
}
|
||||
|
|
@ -1722,7 +1722,7 @@ __declspec(noinline) int CNavigationManager::Navigate(int cellX, int cellY) {
|
|||
|
||||
bool sameMap = std::strcmp(info->GetName(), g_session.m_navigationPlayerMap) == 0;
|
||||
if (!sameMap) {
|
||||
const std::string resolved = ResourceMgr::Instance().aliases.ResolveMapName(g_session.m_navigationPlayerMap);
|
||||
const std::string resolved = ResourceMgr::Instance().ResolveMapName(g_session.m_navigationPlayerMap);
|
||||
sameMap = std::strcmp(info->GetName(), resolved.c_str()) == 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue