AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 06:27:43 +00:00
Code Issues Projects Releases Wiki Activity

General resource handling bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2017-11-14 18:12:13 -10:00
parent 8cef6ce5e0
commit 2df95c01cf
34 changed files with 114 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/World/CWorld.hpp
View File

@@ -46,9 +46,9 @@ class CDummyWorld : public IWorld
} x8_phase = Phase::Loading;
CAssetId xc_mlvlId;
CAssetId x10_strgId;
CAssetId x14_savwId = -1;
CAssetId x14_savwId;
std::vector<CDummyGameArea> x18_areas;
CAssetId x28_mapWorldId = -1;
CAssetId x28_mapWorldId;
TLockedToken<CMapWorld> x2c_mapWorld;
std::shared_ptr<IDvdRequest> x30_loadToken;
std::unique_ptr<uint8_t[]> x34_loadBuf;
@@ -113,11 +113,11 @@ private:
LoadingSoundGroups,
Done,
} x4_phase = Phase::Loading;
CAssetId x8_mlvlId = -1;
CAssetId xc_strgId = -1;
CAssetId x10_savwId = -1;
CAssetId x8_mlvlId;
CAssetId xc_strgId;
CAssetId x10_savwId;
std::vector<std::unique_ptr<CGameArea>> x18_areas;
CAssetId x24_mapwId = -1;
CAssetId x24_mapwId;
TLockedToken<CMapWorld> x28_mapWorld;
std::vector<CRelay> x2c_relays;
//AsyncTask x3c_loadToken;