AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix regression

This commit is contained in:
Phillip Stephens 2019-11-06 10:12:20 -08:00
parent 297513c8d4
commit f2c207b85e
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Runtime/World/CWorld.cpp
View File

@ -294,7 +294,7 @@ bool CWorld::CheckWorldComplete(CStateManager* mgr, TAreaId id, CAssetId mreaId)
if (version >= 12) { if (version >= 12) {
CAssetId skyboxId = r.readUint32Big(); CAssetId skyboxId = r.readUint32Big();
if (skyboxId.IsValid() && mgr) if (skyboxId.IsValid() && mgr)
x94_skyboxWorld.emplace(g_SimplePool->GetObj(SObjectTag{FOURCC('CMDL'), skyboxId})); x94_skyboxWorld = g_SimplePool->GetObj(SObjectTag{FOURCC('CMDL'), skyboxId});
} }
if (version >= 17) if (version >= 17)
x2c_relays = CWorld::CRelay::ReadMemoryRelays(r); x2c_relays = CWorld::CRelay::ReadMemoryRelays(r);
@ -373,7 +373,6 @@ bool CWorld::CheckWorldComplete(CStateManager* mgr, TAreaId id, CAssetId mreaId)
x70_27_skyboxVisible = false; x70_27_skyboxVisible = false;
if (x94_skyboxWorld) { if (x94_skyboxWorld) {
CModel* skybox = x94_skyboxWorld->GetObj(); CModel* skybox = x94_skyboxWorld->GetObj();
if (!skybox) if (!skybox)
return false; return false;
@ -592,17 +591,17 @@ void CWorld::Update(float dt) {
if (overrideSkyId.IsValid() && needsSky) { if (overrideSkyId.IsValid() && needsSky) {
x70_26_skyboxActive = true; x70_26_skyboxActive = true;
x70_27_skyboxVisible = skyVisible; x70_27_skyboxVisible = skyVisible;
xb4_skyboxOverride = {g_SimplePool->GetObj({SBIG('CMDL'), overrideSkyId})}; xb4_skyboxOverride = g_SimplePool->GetObj({SBIG('CMDL'), overrideSkyId});
xa4_skyboxWorldLoaded = TLockedToken<CModel>(); xa4_skyboxWorldLoaded.reset();
if (x94_skyboxWorld) if (x94_skyboxWorld)
x94_skyboxWorld->Unlock(); x94_skyboxWorld->Unlock();
} else { } else {
xb4_skyboxOverride = TLockedToken<CModel>(); xb4_skyboxOverride.reset();
if (!x94_skyboxWorld) { if (!x94_skyboxWorld) {
x70_26_skyboxActive = false; x70_26_skyboxActive = false;
x70_27_skyboxVisible = false; x70_27_skyboxVisible = false;
} else if (!needsSky) { } else if (!needsSky) {
xa4_skyboxWorldLoaded = TLockedToken<CModel>(); xa4_skyboxWorldLoaded.reset();
x94_skyboxWorld->Unlock(); x94_skyboxWorld->Unlock();
x70_26_skyboxActive = false; x70_26_skyboxActive = false;
x70_27_skyboxVisible = false; x70_27_skyboxVisible = false;