From 290c79b57edf841dbe4059e63971cdb7b4daa6d6 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Thu, 18 Oct 2018 09:44:43 -1000 Subject: [PATCH] Fix AABB-point collision issue --- Runtime/Character/CGroundMovement.cpp | 4 ++-- specter | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Runtime/Character/CGroundMovement.cpp b/Runtime/Character/CGroundMovement.cpp index 5307c8545..4c3ec1921 100644 --- a/Runtime/Character/CGroundMovement.cpp +++ b/Runtime/Character/CGroundMovement.cpp @@ -385,7 +385,7 @@ void CGroundMovement::MoveGroundCollider_New(CStateManager& mgr, CPhysicsActor& CGameCollision::BuildAreaCollisionCache(mgr, cache); CPlayer& player = static_cast(actor); player.x9c5_28_slidingOnWall = false; - bool startingJump = player.x258_movementState == CPlayer::EPlayerMovementState::ApplyJump; + bool applyJump = player.x258_movementState == CPlayer::EPlayerMovementState::ApplyJump; bool dampUnderwater = false; if (player.x9c4_31_dampUnderwaterMotion) if (!mgr.GetPlayerState()->HasPowerUp(CPlayerState::EItemType::GravitySuit)) @@ -401,7 +401,7 @@ void CGroundMovement::MoveGroundCollider_New(CStateManager& mgr, CPhysicsActor& CMaterialList material(EMaterialTypes::NoStepLogic); SMoveObjectResult result; - if (!startingJump) + if (!applyJump) { SMovementOptions opts; opts.x0_setWaterLandingForce = false; diff --git a/specter b/specter index 7ff240567..8d29c1449 160000 --- a/specter +++ b/specter @@ -1 +1 @@ -Subproject commit 7ff240567107e87d46b6ce1b00cb73f6c249b08d +Subproject commit 8d29c1449c4e661449c6b666c2fe17ce35dff023