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

Bug fixes and more CStateManager imps

Browse Source
This commit is contained in:
Jack Andersen
2017-02-13 18:27:20 -10:00
parent ac5f28eeff
commit 59406a069b
18 changed files with 194 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/World/CWorld.cpp
View File

@@ -183,8 +183,9 @@ std::string CDummyWorld::IGetDefaultAudioTrack() const { return {}; }
int CDummyWorld::IGetAreaCount() const { return x18_areas.size(); }
CWorld::CWorld(IObjectStore& objStore, IFactory& resFactory, ResId mlvlId)
: x60_objectStore(objStore), x64_resFactory(resFactory)
: x8_mlvlId(mlvlId), x60_objectStore(objStore), x64_resFactory(resFactory)
{
x70_24_ = true;
SObjectTag tag{FOURCC('MLVL'), mlvlId};
static_cast<ProjectResourceFactoryBase&>(resFactory).LoadResourceAsync(tag, x40_loadBuf);
}
@@ -263,7 +264,7 @@ bool CWorld::CheckWorldComplete(CStateManager* mgr, TAreaId id, ResId mreaId)
{
if (!x40_loadBuf)
return false;
athena::io::MemoryReader r(x40_loadBuf.get(), UINT32_MAX, false);
athena::io::MemoryReader r(x40_loadBuf.get(), UINT32_MAX);
r.readUint32Big();
int version = r.readUint32Big();
xc_strgId = r.readUint32Big();