AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix sort placement derp

This commit is contained in:
Phillip Stephens 2017-02-09 00:17:10 -08:00
parent 7e4c82a013
commit 48c295f9d8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Runtime/CMemoryCardSys.cpp
View File

@ -157,10 +157,6 @@ bool CMemoryCardSys::InitializePump()
x20_scanStates.emplace_back(scan.x0_id, scan.x4_category); x20_scanStates.emplace_back(scan.x0_id, scan.x4_category);
} }
std::sort(x20_scanStates.begin(), x20_scanStates.end(), [&](const auto& a, const auto& b) ->bool{
return g_ResFactory->TranslateNewToOriginal(a.first) < g_ResFactory->TranslateNewToOriginal(b.first);
});
wldMemOut.x3c_saveWorld = std::move(world.x34_saveWorld); wldMemOut.x3c_saveWorld = std::move(world.x34_saveWorld);
wldMemOut.x2c_worldName = g_SimplePool->GetObj(SObjectTag{FOURCC('STRG'), wldMemOut.x0_strgId}); wldMemOut.x2c_worldName = g_SimplePool->GetObj(SObjectTag{FOURCC('STRG'), wldMemOut.x0_strgId});
} }
@ -169,7 +165,12 @@ bool CMemoryCardSys::InitializePump()
} }
if (done) if (done)
{
std::sort(x20_scanStates.begin(), x20_scanStates.end(), [&](const auto& a, const auto& b) ->bool{
return g_ResFactory->TranslateNewToOriginal(a.first) < g_ResFactory->TranslateNewToOriginal(b.first);
});
x1c_worldInter = std::experimental::nullopt; x1c_worldInter = std::experimental::nullopt;
}
return false; return false;
} }