AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-13 16:46:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #166 from lioncash/redundant

Browse Source 
CGroundMovement: Collapse 'dampUnderwater ? 0.2f : 0.2f' conditional
This commit is contained in:
Luke S 2020-02-26 13:19:22 -05:00 committed by GitHub
commit 751838f00e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/Character/CGroundMovement.cpp
View File

@ -488,7 +488,7 @@ void CGroundMovement::MoveGroundCollider_New(CStateManager& mgr, CPhysicsActor&
opts.x24_dampedNormalCoefficient = 0.f; opts.x24_dampedNormalCoefficient = 0.f;
opts.x28_dampedDeltaCoefficient = 1.f; opts.x28_dampedDeltaCoefficient = 1.f;
opts.x2c_floorElasticForce = 0.1f; opts.x2c_floorElasticForce = 0.1f;
opts.x30_wallElasticConstant = dampUnderwater ? 0.2f : 0.2f; opts.x30_wallElasticConstant = 0.2f;
opts.x3c_floorPlaneNormal = player.GetLastFloorPlaneNormal(); opts.x3c_floorPlaneNormal = player.GetLastFloorPlaneNormal();
opts.x38_maxPositiveVerticalVelocity = player.GetMaximumPlayerPositiveVerticalVelocity(mgr); opts.x38_maxPositiveVerticalVelocity = player.GetMaximumPlayerPositiveVerticalVelocity(mgr);