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

Restore CCameraManager::GetCurrentCamera's proper behavior (AKA, I'm an idiot)

Browse Source
This commit is contained in:
Phillip Stephens
2017-03-05 09:54:00 -08:00
parent d78feb1196
commit fe72458f48
6 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/Camera/CCameraManager.cpp
View File

@@ -142,16 +142,16 @@ void CCameraManager::Update(float dt, CStateManager& stateMgr)
#endif
}
CEntity* CCameraManager::GetCurrentCamera(CStateManager& stateMgr) const
CGameCamera* CCameraManager::GetCurrentCamera(CStateManager& stateMgr) const
{
CObjectList* camList = stateMgr.ObjectListById(EGameObjectList::GameCamera);
return camList->GetObjectById(GetCurrentCameraId());
return static_cast<CGameCamera*>(camList->GetObjectById(GetCurrentCameraId()));
}
const CEntity* CCameraManager::GetCurrentCamera(const CStateManager& stateMgr) const
const CGameCamera* CCameraManager::GetCurrentCamera(const CStateManager& stateMgr) const
{
const CObjectList* camList = stateMgr.GetObjectListById(EGameObjectList::GameCamera);
return camList->GetObjectById(GetCurrentCameraId());
return static_cast<const CGameCamera*>(camList->GetObjectById(GetCurrentCameraId()));
}
void CCameraManager::SkipCinematic(CStateManager& stateMgr)