2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 09:47:43 +00:00

Finish CMetroidAreaCollider

This commit is contained in:
Jack Andersen
2017-06-29 15:39:34 -10:00
parent ec7ac212ef
commit ff15bfbec3
10 changed files with 685 additions and 19 deletions

View File

@@ -1829,7 +1829,7 @@ void CStateManager::Update(float dt)
if (x904_gameState != EGameState::Paused)
{
PreThinkEffects(dt);
PreThinkObjects(dt);
x87c_fluidPlaneManager->Update(dt);
}
@@ -1961,7 +1961,7 @@ void CStateManager::UpdateHintState(float dt)
}
}
void CStateManager::PreThinkEffects(float dt)
void CStateManager::PreThinkObjects(float dt)
{
if (x84c_player->x9f4_deathTime > 0.f)
{
@@ -1974,7 +1974,7 @@ void CStateManager::PreThinkEffects(float dt)
if (TCastToPtr<CScriptEffect> effect = ent)
effect->PreThink(dt, *this);
for (CEntity* ent : GetCameraObjectList())
for (CEntity* ent : GetAllObjectList())
if (ent && !GetCameraObjectList().GetObjectById(ent->GetUniqueId()))
ent->PreThink(dt, *this);
}