diff --git a/Source/vampires/Weapons/FireWandWeapon.cpp b/Source/vampires/Weapons/FireWandWeapon.cpp index 66914cc..4f6f5f3 100644 --- a/Source/vampires/Weapons/FireWandWeapon.cpp +++ b/Source/vampires/Weapons/FireWandWeapon.cpp @@ -4,6 +4,7 @@ #include "FireWandWeapon.h" #include "Kismet/KismetMathLibrary.h" +#include "vampires/Projectile.h" AFireWandWeapon::AFireWandWeapon() { diff --git a/Source/vampires/Weapons/GarlicWeapon.cpp b/Source/vampires/Weapons/GarlicWeapon.cpp index 0cee41e..717275e 100644 --- a/Source/vampires/Weapons/GarlicWeapon.cpp +++ b/Source/vampires/Weapons/GarlicWeapon.cpp @@ -2,6 +2,8 @@ #include "GarlicWeapon.h" +#include "Components/SphereComponent.h" +#include "vampires/EnemyCharacter.h" AGarlicWeapon::AGarlicWeapon() { diff --git a/Source/vampires/Weapons/GarlicWeapon.h b/Source/vampires/Weapons/GarlicWeapon.h index cc2ac3f..8f53a2d 100644 --- a/Source/vampires/Weapons/GarlicWeapon.h +++ b/Source/vampires/Weapons/GarlicWeapon.h @@ -4,10 +4,11 @@ #include "CoreMinimal.h" #include "../Weapon.h" -#include "Components/SphereComponent.h" -#include "vampires/EnemyCharacter.h" #include "GarlicWeapon.generated.h" +class USphereComponent; +class AEnemyCharacter; + USTRUCT() struct FOverlappedEnemy { diff --git a/Source/vampires/Weapons/GunWeapon.cpp b/Source/vampires/Weapons/GunWeapon.cpp index dd23fd2..97bac61 100644 --- a/Source/vampires/Weapons/GunWeapon.cpp +++ b/Source/vampires/Weapons/GunWeapon.cpp @@ -6,6 +6,7 @@ #include "Kismet/GameplayStatics.h" #include "Kismet/KismetMathLibrary.h" #include "vampires/PlayerCharacter.h" +#include "vampires/Projectile.h" #include "vampires/VampirePlayerController.h" AGunWeapon::AGunWeapon() diff --git a/Source/vampires/Weapons/KnifeWeapon.cpp b/Source/vampires/Weapons/KnifeWeapon.cpp index 7080aba..884915e 100644 --- a/Source/vampires/Weapons/KnifeWeapon.cpp +++ b/Source/vampires/Weapons/KnifeWeapon.cpp @@ -5,6 +5,7 @@ #include "Kismet/GameplayStatics.h" #include "vampires/PlayerCharacter.h" +#include "vampires/Projectile.h" AKnifeWeapon::AKnifeWeapon() { diff --git a/Source/vampires/Weapons/LightningRingWeapon.cpp b/Source/vampires/Weapons/LightningRingWeapon.cpp index 22f5662..ec83d9e 100644 --- a/Source/vampires/Weapons/LightningRingWeapon.cpp +++ b/Source/vampires/Weapons/LightningRingWeapon.cpp @@ -2,6 +2,8 @@ #include "LightningRingWeapon.h" +#include "Components/SphereComponent.h" +#include "vampires/EnemyCharacter.h" ALightningRingWeapon::ALightningRingWeapon() { diff --git a/Source/vampires/Weapons/LightningRingWeapon.h b/Source/vampires/Weapons/LightningRingWeapon.h index 6560020..b76fca9 100644 --- a/Source/vampires/Weapons/LightningRingWeapon.h +++ b/Source/vampires/Weapons/LightningRingWeapon.h @@ -4,10 +4,10 @@ #include "CoreMinimal.h" #include "../Weapon.h" -#include "Components/SphereComponent.h" -#include "vampires/EnemyCharacter.h" #include "LightningRingWeapon.generated.h" +class AEnemyCharacter; +class USphereComponent; /** * */ diff --git a/Source/vampires/Weapons/MagicWandWeapon.cpp b/Source/vampires/Weapons/MagicWandWeapon.cpp index 0533cdb..93e3a49 100644 --- a/Source/vampires/Weapons/MagicWandWeapon.cpp +++ b/Source/vampires/Weapons/MagicWandWeapon.cpp @@ -5,6 +5,7 @@ #include "Kismet/GameplayStatics.h" #include "Kismet/KismetMathLibrary.h" +#include "vampires/Projectile.h" AMagicWandWeapon::AMagicWandWeapon() { diff --git a/Source/vampires/Weapons/PentagramWeapon.cpp b/Source/vampires/Weapons/PentagramWeapon.cpp index 01e9976..e956867 100644 --- a/Source/vampires/Weapons/PentagramWeapon.cpp +++ b/Source/vampires/Weapons/PentagramWeapon.cpp @@ -6,6 +6,9 @@ #include "Kismet/GameplayStatics.h" #include "vampires/VampirePlayerController.h" #include "../PlayerCharacter.h" +#include "Components/BoxComponent.h" +#include "vampires/EnemyCharacter.h" +#include "vampires/Pickup.h" APentagramWeapon::APentagramWeapon() { diff --git a/Source/vampires/Weapons/PentagramWeapon.h b/Source/vampires/Weapons/PentagramWeapon.h index d46235a..aa97934 100644 --- a/Source/vampires/Weapons/PentagramWeapon.h +++ b/Source/vampires/Weapons/PentagramWeapon.h @@ -4,11 +4,11 @@ #include "CoreMinimal.h" #include "../Weapon.h" -#include "Components/BoxComponent.h" -#include "vampires/EnemyCharacter.h" -#include "vampires/Pickup.h" #include "PentagramWeapon.generated.h" +class APickup; +class AEnemyCharacter; +class UBoxComponent; /** * */ diff --git a/Source/vampires/Weapons/ProjectileWeapon.cpp b/Source/vampires/Weapons/ProjectileWeapon.cpp index b25f7d3..b38ccb4 100644 --- a/Source/vampires/Weapons/ProjectileWeapon.cpp +++ b/Source/vampires/Weapons/ProjectileWeapon.cpp @@ -7,6 +7,8 @@ #include "vampires/EnemyCharacter.h" #include "vampires/PlayerCharacter.h" #include "vampires/VampirePlayerController.h" +#include "../Weapon.h" +#include "Components/BoxComponent.h" AProjectileWeapon::AProjectileWeapon() { @@ -43,7 +45,8 @@ void AProjectileWeapon::BeginPlay() } void AProjectileWeapon::OnWeaponBeginOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor, - UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult) + UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, + const FHitResult& SweepResult) { if (AEnemyCharacter* Enemy = Cast(OtherActor)) { @@ -52,7 +55,7 @@ void AProjectileWeapon::OnWeaponBeginOverlap(UPrimitiveComponent* OverlappedComp } void AProjectileWeapon::OnWeaponEndOverlap(UPrimitiveComponent* OverlappedComp, AActor* OtherActor, - UPrimitiveComponent* OtherComp, int32 OtherBodyIndex) + UPrimitiveComponent* OtherComp, int32 OtherBodyIndex) { if (AEnemyCharacter* Enemy = Cast(OtherActor)) { @@ -61,7 +64,8 @@ void AProjectileWeapon::OnWeaponEndOverlap(UPrimitiveComponent* OverlappedComp, } void AProjectileWeapon::OnProjectileBeginOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor, - UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult) + UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, + const FHitResult& SweepResult) { if (AEnemyCharacter* Enemy = Cast(OtherActor)) { diff --git a/Source/vampires/Weapons/ProjectileWeapon.h b/Source/vampires/Weapons/ProjectileWeapon.h index bd1497f..9af30b6 100644 --- a/Source/vampires/Weapons/ProjectileWeapon.h +++ b/Source/vampires/Weapons/ProjectileWeapon.h @@ -3,11 +3,12 @@ #pragma once #include "CoreMinimal.h" -#include "../Weapon.h" -#include "Components/BoxComponent.h" -#include "vampires/Projectile.h" +#include "vampires/Weapon.h" #include "ProjectileWeapon.generated.h" +class AProjectile; +class UBoxComponent; + /** * */