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

Work on CBallCamera

Browse Source
This commit is contained in:
Jack Andersen
2017-10-14 19:38:10 -10:00
parent 96c17ba729
commit 2aee5910d6
10 changed files with 432 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/World/CPlayer.cpp
View File

@@ -281,7 +281,7 @@ void CPlayer::TransitionFromMorphBallState(CStateManager& mgr)
CBallCamera* ballCam = mgr.GetCameraManager()->GetBallCamera();
if (TCastToConstPtr<CActor> act = mgr.GetObjectById(ballCam->GetTooCloseActorId()))
{
if (ballCam->GetX3E0() < 20.f && ballCam->GetX3E0() > 1.f)
if (ballCam->GetTooCloseActorDistance() < 20.f && ballCam->GetTooCloseActorDistance() > 1.f)
{
zeus::CVector3f deltaFlat = act->GetTranslation() - GetTranslation();
deltaFlat.z = 0.f;
@@ -5439,7 +5439,7 @@ void CPlayer::BombJump(const zeus::CVector3f& pos, CStateManager& mgr)
else
{
CBallCamera* ballCam = mgr.GetCameraManager()->GetBallCamera();
if (ballCam->GetTooCloseActorId() != kInvalidUniqueId && ballCam->GetX3E0() < 5.f)
if (ballCam->GetTooCloseActorId() != kInvalidUniqueId && ballCam->GetTooCloseActorDistance() < 5.f)
{
x9d0_bombJumpCount = 1;
x9d4_bombJumpCheckDelayFrames = 2;