mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-08 21:47:42 +00:00
Better null-tag handling; integrate CSaveWorld and CMapWorld loading
This commit is contained in:
@@ -54,6 +54,7 @@ bool CSaveWorldIntermediate::InitializePump()
|
||||
|
||||
CMemoryCardSys::CMemoryCardSys()
|
||||
{
|
||||
x0_hints = g_SimplePool->GetObj("HINT_Hints");
|
||||
xc_memoryWorlds.reserve(16);
|
||||
x1c_worldInter.emplace();
|
||||
x1c_worldInter->reserve(16);
|
||||
@@ -81,6 +82,8 @@ bool CMemoryCardSys::InitializePump()
|
||||
for (const auto& world : xc_memoryWorlds)
|
||||
{
|
||||
const CSaveWorldMemory& wld = world.second;
|
||||
if (!wld.GetWorldName())
|
||||
continue;
|
||||
if (!wld.GetWorldName().IsLoaded() ||
|
||||
!wld.GetWorldName().GetObj())
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user