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

Fix game crashing when touching a dock to an unloaded area

Browse Source
This commit is contained in:
Phillip Stephens
2017-12-03 18:26:17 -08:00
parent 2bb0a9687e
commit 5c7a03fb40
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/CStateManager.cpp
View File

@@ -434,16 +434,16 @@ void CStateManager::SetActorAreaId(CActor& actor, TAreaId aid)
{
CGameArea* area = x850_world->GetArea(actorAid);
if (area->IsPostConstructed())
area->GetAreaObjects().RemoveObject(actor.GetUniqueId());
area->GetAreaObjects()->RemoveObject(actor.GetUniqueId());
}
if (aid == kInvalidAreaId)
return;
CGameArea* area = x850_world->GetArea(aid);
if (!area->IsPostConstructed() || area->GetAreaObjects().GetValidObjectById(actor.GetUniqueId()))
if (!area->IsPostConstructed() || area->GetAreaObjects()->GetValidObjectById(actor.GetUniqueId()))
return;
area->GetAreaObjects().AddObject(actor);
area->GetAreaObjects()->AddObject(actor);
}
void CStateManager::TouchSky() const
@@ -2300,7 +2300,7 @@ void CStateManager::RemoveObject(TUniqueId uid)
{
CGameArea* area = x850_world->GetArea(ent->GetAreaIdAlways());
if (area->IsPostConstructed())
area->GetAreaObjects().RemoveObject(uid);
area->GetAreaObjects()->RemoveObject(uid);
}
if (TCastToPtr<CActor> act = ent)
x874_sortedListManager->Remove(act.GetPtr());
@@ -2470,7 +2470,7 @@ void CStateManager::AddObject(CEntity& ent)
{
CGameArea* area = x850_world->GetArea(ent.GetAreaIdAlways());
if (area->IsPostConstructed())
area->GetAreaObjects().AddObject(ent);
area->GetAreaObjects()->AddObject(ent);
}
if (TCastToPtr<CActor> act = ent)