From baf54dd6f5884c6640fb5b75b8e1c4b3ac671d9b Mon Sep 17 00:00:00 2001 From: baz Date: Wed, 6 Mar 2024 02:04:57 +0000 Subject: [PATCH] Fix minor bugs --- Source/Nakatomi/EnemyCharacter.cpp | 6 ++++-- Source/Nakatomi/NakatomiCharacter.cpp | 13 ++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Source/Nakatomi/EnemyCharacter.cpp b/Source/Nakatomi/EnemyCharacter.cpp index b23e46f..9042fe5 100644 --- a/Source/Nakatomi/EnemyCharacter.cpp +++ b/Source/Nakatomi/EnemyCharacter.cpp @@ -142,7 +142,9 @@ void AEnemyCharacter::OnDamaged() { Super::OnDamaged(); - AEnemyAIController* controller = Cast(GetController()); - controller->GetBlackboardComponent()->SetValueAsFloat("CurrentHealth", GetHealthComponent()->GetCurrentHealth()); + if (AEnemyAIController* controller = Cast(GetController())) + { + controller->GetBlackboardComponent()->SetValueAsFloat("CurrentHealth", GetHealthComponent()->GetCurrentHealth()); + } } diff --git a/Source/Nakatomi/NakatomiCharacter.cpp b/Source/Nakatomi/NakatomiCharacter.cpp index cb83a0e..6bc791a 100644 --- a/Source/Nakatomi/NakatomiCharacter.cpp +++ b/Source/Nakatomi/NakatomiCharacter.cpp @@ -275,12 +275,15 @@ void ANakatomiCharacter::PlayOnFireAnimations() void ANakatomiCharacter::OnDamaged() { - int32 randomAnimMontage = FMath::RandRange(0,OnDamagedHitAnimMontages.Num()-1); - - if (OnDamagedHitAnimMontages[randomAnimMontage] != nullptr) + if (OnDamagedHitAnimMontages.Num() > 0) { - //TODO: Disable movement while playing animation montage - // PlayAnimMontage(OnDamagedHitAnimMontages[randomAnimMontage]); + int32 randomAnimMontage = FMath::RandRange(0,OnDamagedHitAnimMontages.Num()-1); + + if (OnDamagedHitAnimMontages[randomAnimMontage] != nullptr) + { + //TODO: Disable movement while playing animation montage + // PlayAnimMontage(OnDamagedHitAnimMontages[randomAnimMontage]); + } } }