AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 13:44:56 +00:00
Code Issues Projects Releases Wiki Activity

Finish CScriptPlayerActor

Browse Source
This commit is contained in:
Jack Andersen
2018-05-13 18:38:58 -10:00
parent 9130b9459a
commit 317aa9af25
16 changed files with 498 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Camera/CCinematicCamera.cpp
View File

@@ -215,7 +215,7 @@ void CCinematicCamera::Think(float dt, CStateManager& mgr)
if (x20c_lookAtId != kInvalidUniqueId)
if (TCastToPtr<CScriptActor> act = mgr.ObjectById(x20c_lookAtId))
if (act->IsCameraMoveIntoAlpha())
if (act->IsPlayerActor())
act->SetDrawFlags({5, 0, 3, zeus::CColor(1.f, GetMoveOutofIntoAlpha())});
x1ec_t += dt;
@@ -243,7 +243,7 @@ void CCinematicCamera::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid,
TUniqueId id = mgr.GetIdForScript(conn.x8_objId);
if (TCastToPtr<CScriptActor> act = mgr.ObjectById(id))
{
if (act->IsCameraMoveIntoAlpha())
if (act->IsPlayerActor())
{
x20c_lookAtId = id;
if (conn.x4_msg != EScriptObjectMessage::Deactivate &&
@@ -286,7 +286,7 @@ void CCinematicCamera::CalculateMoveOutofIntoEyePosition(bool outOfEye, CStateMa
{
if (TCastToConstPtr<CScriptActor> act = mgr.GetObjectById(x20c_lookAtId))
{
if (act->IsCameraMoveIntoAlpha())
if (act->IsPlayerActor())
{
if (const CModelData* mData = act->GetModelData())
{