Source/vampires/EXPPickup.cpp

@@ -2,7 +2,9 @@
 
 
 #include "EXPPickup.h"
+
 #include "EXPComponent.h"
+#include "PlayerCharacter.h"
 
 void AEXPPickup::BeginPlay()
 {
@@ -15,12 +17,11 @@ void AEXPPickup::Tick(float DeltaSeconds)
 }
 
 void AEXPPickup::OnInnerBeginOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor,
-                                     UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep,
-                                     const FHitResult& SweepResult)
+	UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult)
 {
-	if (UEXPComponent* expComponent = OtherActor->GetComponentByClass<UEXPComponent>())
+	if (APlayerCharacter* PlayerCharacter = Cast<APlayerCharacter>(OtherActor))
 	{
-		expComponent->IncrementEXP(EXP);
+		PlayerCharacter->GetEXPComponent()->IncrementEXP(EXP);
 		Super::OnInnerBeginOverlap(OverlappedComponent, OtherActor, OtherComp, OtherBodyIndex, bFromSweep, SweepResult);
 	}
 }

Source/vampires/GoldPickup.cpp

@@ -4,6 +4,7 @@
 #include "GoldPickup.h"
 
 #include "GoldComponent.h"
+#include "PlayerCharacter.h"
 
 class APlayerCharacter;
 
@@ -18,12 +19,11 @@ void AGoldPickup::Tick(float DeltaSeconds)
 }
 
 void AGoldPickup::OnInnerBeginOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor,
-                                      UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep,
-                                      const FHitResult& SweepResult)
+	UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult)
 {
-	if (UGoldComponent* goldComponent = OtherActor->GetComponentByClass<UGoldComponent>())
+	if (APlayerCharacter* PlayerCharacter = Cast<APlayerCharacter>(OtherActor))
 	{
-		goldComponent->IncrementGold(Gold);
+		PlayerCharacter->GetGoldComponent()->IncrementGold(Gold);
 		Super::OnInnerBeginOverlap(OverlappedComponent, OtherActor, OtherComp, OtherBodyIndex, bFromSweep, SweepResult);
 	}
 }

Source/vampires/VampirePlayerController.cpp

@@ -4,6 +4,7 @@
 #include "VampirePlayerController.h"
 
 #include "EXPComponent.h"
+#include "HealthComponent.h"
 #include "VampireGameMode.h"
 #include "Blueprint/UserWidget.h"
 #include "Kismet/GameplayStatics.h"
@@ -24,8 +25,9 @@ void AVampirePlayerController::OnPossess(APawn* aPawn)
 			UpdatePlayerEXPHUD(expComponent->GetCurrentEXP(), expComponent->GetCurrentLevelPercent());
 			UpdatePlayerLevelHUD(expComponent->GetCurrentLevel());
 		}
-
-		if (AVampireGameMode* gamemode = Cast<AVampireGameMode>(UGameplayStatics::GetGameMode(GetWorld())))
+		
+		AVampireGameMode* gamemode = Cast<AVampireGameMode>(UGameplayStatics::GetGameMode(GetWorld()));
+		if (gamemode)
 		{
 			gamemode->OnEnemyDeathCountIncrementDelegate.AddDynamic(this, &AVampirePlayerController::UpdateKillCountHUD);
 			UpdateKillCountHUD(gamemode->GetEnemyDeathCount());

Source/vampires/Widgets/HealthbarWidget.cpp

@@ -4,6 +4,7 @@
 #include "HealthbarWidget.h"
 
 #include "Kismet/GameplayStatics.h"
+#include "vampires/PlayerCharacter.h"
 #include "Components/ProgressBar.h"
 #include "vampires/HealthComponent.h"
 #include "vampires/VampireCharacter.h"
@@ -11,25 +12,15 @@
 void UHealthbarWidget::NativeConstruct()
 {
 	Super::NativeConstruct();
-
-	if (ACharacter* character = UGameplayStatics::GetPlayerCharacter(GetWorld(), 0))
-	{
-		if (UHealthComponent* healthComponent = character->FindComponentByClass<UHealthComponent>())
-		{
-			healthComponent->OnDamaged.AddDynamic(this, &UHealthbarWidget::UpdateHealthBar);
-			UpdateHealthBar({});
-		}
-	}
+	APlayerCharacter* player = Cast<APlayerCharacter>(UGameplayStatics::GetPlayerCharacter(GetWorld(), 0));
+	UHealthComponent* healthComponent = player->GetHealthComponent();
+	healthComponent->OnDamaged.AddDynamic(this, &UHealthbarWidget::UpdateHealthBar);
+	UpdateHealthBar({});
 }
 
 void UHealthbarWidget::UpdateHealthBar(FDamageInfo damageInfo)
 {
-	if (ACharacter* character = UGameplayStatics::GetPlayerCharacter(GetWorld(), 0))
-	{
-		if (UHealthComponent* healthComponent = character->FindComponentByClass<UHealthComponent>())
-		{
-			float percent = healthComponent->GetCurrentHealth() / healthComponent->GetMaxHealth();
-			HealthBar->SetPercent(percent);
-		}
-	}
+	APlayerCharacter* player = Cast<APlayerCharacter>(UGameplayStatics::GetPlayerCharacter(GetWorld(), 0));
+	float percent = player->GetHealthComponent()->GetCurrentHealth() / player->GetHealthComponent()->GetMaxHealth();
+	HealthBar->SetPercent(percent);
 }

Source/vampires/Widgets/HealthbarWidget.h

@@ -4,6 +4,7 @@
 
 #include "CoreMinimal.h"
 #include "Blueprint/UserWidget.h"
+#include "vampires/HealthComponent.h"
 #include "HealthbarWidget.generated.h"
 
 class UProgressBar;