From f510f1904cb0adbb0d71d0bac1322e934b81431f Mon Sep 17 00:00:00 2001 From: Luke Street Date: Thu, 10 Feb 2022 23:06:51 -0500 Subject: [PATCH 1/2] CScriptSpiderBallWaypoint: Small fix in GetClosestPointAlongWaypoints --- Runtime/World/CScriptSpiderBallWaypoint.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Runtime/World/CScriptSpiderBallWaypoint.cpp b/Runtime/World/CScriptSpiderBallWaypoint.cpp index 986ba209e..73d1f2425 100644 --- a/Runtime/World/CScriptSpiderBallWaypoint.cpp +++ b/Runtime/World/CScriptSpiderBallWaypoint.cpp @@ -197,7 +197,7 @@ void CScriptSpiderBallWaypoint::GetClosestPointAlongWaypoints(CStateManager& mgr closestPoint = lastPoint; if (wp->PreviousWaypoint(mgr, ECheckActiveWaypoint::Check) != kInvalidUniqueId) { wp = static_cast( - mgr.GetObjectById(wp->PreviousWaypoint(mgr, ECheckActiveWaypoint::SkipCheck))); + mgr.GetObjectById(wp->PreviousWaypoint(mgr, ECheckActiveWaypoint::Check))); deltaBetweenPoints = lastPoint - wp->GetTranslation(); interpDeltaBetweenPoints = deltaBetweenPoints; } From a413a010b50a53ebc6b0c726203181fc179d3370 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Fri, 11 Feb 2022 11:05:53 -0500 Subject: [PATCH 2/2] CMorphBall: Fix inverted check in ApplySpiderBallRollForces --- Runtime/World/CMorphBall.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Runtime/World/CMorphBall.cpp b/Runtime/World/CMorphBall.cpp index 853ae91fd..bb325ffc4 100644 --- a/Runtime/World/CMorphBall.cpp +++ b/Runtime/World/CMorphBall.cpp @@ -653,7 +653,7 @@ void CMorphBall::ApplySpiderBallRollForces(const CFinalInput& input, CStateManag x18b4_linVelDamp = 0.4f; x18b8_angVelDamp = 0.2f; float viewControlMag = viewSurfaceForces.dot(x189c_spiderInterpBetweenPoints.normalized()); - if (continueTrackForce && x1920_spiderForcesReset) { + if (continueTrackForce && !x1920_spiderForcesReset) { viewControlMag = x1918_spiderViewControlMag; } else { x1918_spiderViewControlMag = viewControlMag;