From 77d10c5f64de373f8f6f84cdc918541a82f4712e Mon Sep 17 00:00:00 2001 From: Alexander Guncenko Date: Wed, 25 Aug 2021 23:04:20 +0200 Subject: [PATCH 1/2] android compile error fix --- ALS/Source/ALS/Private/Notify/AlsAnimNotify_FootstepEffects.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ALS/Source/ALS/Private/Notify/AlsAnimNotify_FootstepEffects.cpp b/ALS/Source/ALS/Private/Notify/AlsAnimNotify_FootstepEffects.cpp index 2318ba07d..8d8c0d75e 100644 --- a/ALS/Source/ALS/Private/Notify/AlsAnimNotify_FootstepEffects.cpp +++ b/ALS/Source/ALS/Private/Notify/AlsAnimNotify_FootstepEffects.cpp @@ -58,7 +58,7 @@ void UAlsAnimNotify_FootstepEffects::Notify(USkeletalMeshComponent* MeshComponen #endif const FAlsFootstepEffectSettings* EffectSettings{nullptr}; - const EPhysicalSurface SurfaceType{Hit.PhysMaterial.IsValid() ? Hit.PhysMaterial->SurfaceType : SurfaceType_Default}; + const auto SurfaceType{Hit.PhysMaterial.IsValid() ? Hit.PhysMaterial->SurfaceType : TEnumAsByte(SurfaceType_Default)}; for (const auto& Effect : FootstepEffectsSettings->Effects) { From 927f5a614bbda17804e832eb92325be1bbeceb1f Mon Sep 17 00:00:00 2001 From: Alexander Guncenko Date: Wed, 25 Aug 2021 23:29:44 +0200 Subject: [PATCH 2/2] linux compile error fix --- ALS/Source/ALS/Private/AlsCharacter.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ALS/Source/ALS/Private/AlsCharacter.cpp b/ALS/Source/ALS/Private/AlsCharacter.cpp index c8c923628..899ac991c 100644 --- a/ALS/Source/ALS/Private/AlsCharacter.cpp +++ b/ALS/Source/ALS/Private/AlsCharacter.cpp @@ -402,8 +402,8 @@ bool AAlsCharacter::CanSprint() const return LocomotionState.bHasInput && (RotationMode != EAlsRotationMode::Aiming || bSprintHasPriorityOverAiming) && - (ViewMode != EAlsViewMode::FirstPerson && - (DesiredRotationMode == EAlsRotationMode::VelocityDirection || bRotateToVelocityWhenSprinting) || + ((ViewMode != EAlsViewMode::FirstPerson && + (DesiredRotationMode == EAlsRotationMode::VelocityDirection || bRotateToVelocityWhenSprinting)) || FMath::Abs(FRotator::NormalizeAxis(LocomotionState.InputYawAngle - ViewState.SmoothRotation.Yaw)) < 50.0f); } @@ -487,7 +487,7 @@ void AAlsCharacter::RefreshRotationMode() return; } - if (bSprinting && DesiredRotationMode == EAlsRotationMode::Aiming || + if ((bSprinting && DesiredRotationMode == EAlsRotationMode::Aiming) || DesiredRotationMode == EAlsRotationMode::VelocityDirection) { SetRotationMode(EAlsRotationMode::LookingDirection); @@ -865,8 +865,8 @@ void AAlsCharacter::RefreshGroundedActorRotation(const float DeltaTime) // Not moving. - if (!TryRefreshCustomGroundedNotMovingActorRotation(DeltaTime) && - RotationMode == EAlsRotationMode::Aiming || ViewMode == EAlsViewMode::FirstPerson) + if ((!TryRefreshCustomGroundedNotMovingActorRotation(DeltaTime) && + RotationMode == EAlsRotationMode::Aiming) || ViewMode == EAlsViewMode::FirstPerson) { RefreshGroundedNotMovingAimingActorRotation(DeltaTime); } @@ -1811,7 +1811,7 @@ void AAlsCharacter::TryStartRolling(const float PlayRate) { StartRolling(PlayRate, LocomotionState.bHasInput && (RollingSettings.bRotateToInputOnStart || - RollingSettings.bRotateToInputDuringRoll && RollingSettings.InputInterpolationSpeed <= 0.0f) + (RollingSettings.bRotateToInputDuringRoll && RollingSettings.InputInterpolationSpeed <= 0.0f)) ? LocomotionState.InputYawAngle : LocomotionState.Rotation.Yaw); } @@ -1820,8 +1820,8 @@ void AAlsCharacter::TryStartRolling(const float PlayRate) bool AAlsCharacter::IsRollingAllowedToStart(const UAnimMontage* Montage) const { return LocomotionAction == EAlsLocomotionAction::None || - LocomotionAction == EAlsLocomotionAction::Rolling && - !GetMesh()->GetAnimInstance()->Montage_IsPlaying(Montage); + (LocomotionAction == EAlsLocomotionAction::Rolling && + !GetMesh()->GetAnimInstance()->Montage_IsPlaying(Montage)); } void AAlsCharacter::StartRolling(const float PlayRate, const float TargetYawAngle)