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

CScriptTrigger work

Browse Source
This commit is contained in:
Phillip Stephens
2017-01-14 19:59:37 -08:00
parent e2c671e9b4
commit 65fb75737f
39 changed files with 707 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Camera/CCameraManager.cpp
View File

@@ -143,7 +143,7 @@ void CCameraManager::Update(float dt, CStateManager& stateMgr)
CGameCamera* CCameraManager::GetCurrentCamera(CStateManager& stateMgr) const
{
CObjectList* camList = stateMgr.ObjectListById(EGameObjectList::GameCamera);
return static_cast<CGameCamera*>(camList->GetObjectById(GetCurrentCameraId()));
return TCastToPtr<CGameCamera>(camList->GetObjectById(GetCurrentCameraId())).GetPtr();
}
const CGameCamera* CCameraManager::GetCurrentCamera(const CStateManager& stateMgr) const
@@ -169,7 +169,7 @@ void CCameraManager::ThinkCameras(float dt, CStateManager& mgr)
for (CEntity* ent : gcList)
{
CGameCamera* gc = TCastToPtr<CGameCamera>(ent);
TCastToPtr<CGameCamera> gc(ent);
if (gc)
{
gc->Think(dt, mgr);
@@ -221,7 +221,7 @@ void CCameraManager::ResetCameras(CStateManager& mgr)
for (CEntity* ent : mgr.GetCameraObjectList())
{
CGameCamera* camObj = static_cast<CGameCamera*>(ent);
TCastToPtr<CGameCamera> camObj(ent);
camObj->Reset(xf, mgr);
}
}