AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 23:47:42 +00:00
Code Issues Projects Releases Wiki Activity

Better null-tag handling; integrate CSaveWorld and CMapWorld loading

Browse Source
This commit is contained in:
Jack Andersen
2016-10-08 10:32:36 -10:00
parent 647643f579
commit f7f5066038
14 changed files with 85 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/CMemoryCardSys.hpp
View File

@@ -18,7 +18,7 @@ class CSaveWorldMemory
ResId x0_strgId = -1;
ResId x4_savwId = -1;
u32 x8_areaCount;
std::vector<TAreaId> xc_areaIds; /* 4 byte element */
std::vector<ResId> xc_areaIds; /* 4 byte element */
std::vector<u32> x1c_; /* 16 byte element */
TLockedToken<CStringTable> x2c_worldName; /* used to be optional */
TLockedToken<CSaveWorld> x3c_saveWorld; /* used to be optional */
@@ -34,10 +34,10 @@ public:
class CSaveWorldIntermediate
{
friend class CMemoryCardSys;
u32 x0_mlvlId;
u32 x4_strgId;
u32 x8_savwId;
std::vector<TAreaId> xc_areaIds;
ResId x0_mlvlId;
ResId x4_strgId;
ResId x8_savwId;
std::vector<ResId> xc_areaIds;
std::vector<u32> x1c_;
std::unique_ptr<CDummyWorld> x2c_dummyWorld;
TLockedToken<CSaveWorld> x34_saveWorld; /* Used to be auto_ptr */