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

Conform CElementGen with retail

Browse Source
This commit is contained in:
Jack Andersen
2017-06-03 15:01:09 -10:00
parent db8a7d3433
commit 6da6e37d42
17 changed files with 736 additions and 953 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Runtime/CStateManager.cpp
View File

@@ -2316,28 +2316,6 @@ void CStateManager::SetCurrentAreaId(TAreaId aid)
x850_world->GetMapWorld()->RecalculateWorldSphere(*x8c0_mapWorldInfo, *x850_world);
}
void CStateManager::DeleteObjectRequest(TUniqueId id)
{
CEntity* entity = ObjectById(id);
if (!entity)
return;
if (entity->IsInGraveyard())
return;
entity->SetIsInGraveyard(true);
x854_objectGraveyard.push_back(entity->GetUniqueId());
entity->AcceptScriptMsg(EScriptObjectMessage::Deleted, kInvalidUniqueId, *this);
entity->SetIsScriptingBlocked(true);
if (TCastToPtr<CActor> actor = entity)
{
x874_sortedListManager->Remove(actor);
actor->SetUseInSortedLists(false);
}
}
CEntity* CStateManager::ObjectById(TUniqueId uid) { return GetAllObjectList().GetObjectById(uid); }
const CEntity* CStateManager::GetObjectById(TUniqueId uid) const { return GetAllObjectList().GetObjectById(uid); }