From d07932771c8cccb83a019fee94677c87fd82007e Mon Sep 17 00:00:00 2001 From: baz Date: Thu, 17 Jul 2025 22:10:55 +0100 Subject: [PATCH] Fix checks --- Source/vampires/Weapons/SwarmAgent.cpp | 10 ++++++---- Source/vampires/Weapons/SwarmWeapon.cpp | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Source/vampires/Weapons/SwarmAgent.cpp b/Source/vampires/Weapons/SwarmAgent.cpp index 980710a..c128c58 100644 --- a/Source/vampires/Weapons/SwarmAgent.cpp +++ b/Source/vampires/Weapons/SwarmAgent.cpp @@ -42,11 +42,13 @@ void ASwarmAgent::OnSwarmAgentBeginOverlap(UPrimitiveComponent* OverlappedCompon if (!EnemyHealthComponent->GetIsDead()) { - if (AVampireCharacter* character = Cast(GetOwner())) + if (AWeapon* ownerWeapon = Cast(GetOwner())) { - AController* ownerController = character->GetController(); - AWeapon* ownerWeapon = Cast(GetOwner()); - EnemyHealthComponent->TakeDamage(Enemy, ownerWeapon->Damage, nullptr, ownerController, this); + if (AVampireCharacter* character = Cast(ownerWeapon->GetOwner())) + { + AController* ownerController = character->GetController(); + EnemyHealthComponent->TakeDamage(Enemy, ownerWeapon->Damage, nullptr, ownerController, this); + } } } } diff --git a/Source/vampires/Weapons/SwarmWeapon.cpp b/Source/vampires/Weapons/SwarmWeapon.cpp index c29a5b7..f43dc24 100644 --- a/Source/vampires/Weapons/SwarmWeapon.cpp +++ b/Source/vampires/Weapons/SwarmWeapon.cpp @@ -52,7 +52,7 @@ void ASwarmWeapon::TimelineCallback(float val) FVector Direction = FVector(0.0, 1, 0.0); FVector RotatedDirection = Direction.RotateAngleAxis(val * 360.0f + offset, FVector(0.0f, 0.0f, 1.0f)); FVector NewLocation = CenterLocation + (RotatedDirection * Distance); - NewLocation.Z = 140.0f; + NewLocation.Z = 190.0f; SwarmActors[i]->SetActorLocation(NewLocation); } }