AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 01:07: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

8
Runtime/World/CWorld.cpp
View File

@@ -39,7 +39,7 @@ TAreaId CDummyWorld::IGetCurrentAreaId() const { return x3c_curAreaId; }
TAreaId CDummyWorld::IGetAreaId(CAssetId id) const
{
int ret = 0;
if (id == -1)
if (!id.IsValid())
return kInvalidAreaId;
for (const CDummyGameArea& area : x18_areas)
{
@@ -213,7 +213,7 @@ TAreaId CWorld::IGetCurrentAreaId() const { return x68_curAreaId; }
TAreaId CWorld::IGetAreaId(CAssetId id) const
{
int ret = 0;
if (id == -1)
if (!id.IsValid())
return kInvalidAreaId;
for (const std::unique_ptr<CGameArea>& area : x18_areas)
{
@@ -248,7 +248,7 @@ void CWorld::LoadSoundGroups() {}
bool CWorld::CheckWorldComplete(CStateManager* mgr, TAreaId id, CAssetId mreaId)
{
if (mreaId != -1)
if (mreaId.IsValid())
{
x68_curAreaId = 0;
TAreaId aid = 0;
@@ -281,7 +281,7 @@ bool CWorld::CheckWorldComplete(CStateManager* mgr, TAreaId id, CAssetId mreaId)
if (version >= 12)
{
CAssetId skyboxId = r.readUint32Big();
if (skyboxId != -1 && mgr)
if (skyboxId.IsValid() && mgr)
x94_skyboxWorld = g_SimplePool->GetObj(SObjectTag{FOURCC('CMDL'), skyboxId});
}
if (version >= 17)