Source/vampires/EXPPickup.cpp

@@ -3,8 +3,6 @@
 
 #include "EXPPickup.h"
 
-#include "PlayerCharacter.h"
-
 void AEXPPickup::BeginPlay()
 {
 	Super::BeginPlay();
@@ -18,9 +16,7 @@ void AEXPPickup::Tick(float DeltaSeconds)
 void AEXPPickup::OnBeginOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor,
 	UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult)
 {
-	if (APlayerCharacter* PlayerCharacter = Cast<APlayerCharacter>(OtherActor))
+	// TODO: Add EXP to player EXP component
-	{
+	
-		PlayerCharacter->GetEXPComponent()->IncrementEXP(EXP);
+	Super::OnBeginOverlap(OverlappedComponent, OtherActor, OtherComp, OtherBodyIndex, bFromSweep, SweepResult);
-		Super::OnBeginOverlap(OverlappedComponent, OtherActor, OtherComp, OtherBodyIndex, bFromSweep, SweepResult);
-	}
 }

Source/vampires/EXPPickup.h

@@ -14,9 +14,6 @@ class VAMPIRES_API AEXPPickup : public APickup
 {
 	GENERATED_BODY()
 	
-public:
-	int EXP = 1;
-
 protected:
 	virtual void BeginPlay() override;
 
@@ -24,6 +21,6 @@ public:
 	virtual void Tick(float DeltaSeconds) override;
 
 	virtual void OnBeginOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor,
-	                            UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep,
+								UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep,
-	                            const FHitResult& SweepResult) override;
+								const FHitResult& SweepResult) override;
 };

Source/vampires/GoldPickup.cpp

@@ -3,10 +3,6 @@
 
 #include "GoldPickup.h"
 
-#include "PlayerCharacter.h"
-
-class APlayerCharacter;
-
 void AGoldPickup::BeginPlay()
 {
 	Super::BeginPlay();
@@ -20,9 +16,7 @@ void AGoldPickup::Tick(float DeltaSeconds)
 void AGoldPickup::OnBeginOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor,
 	UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult)
 {
-	if (APlayerCharacter* PlayerCharacter = Cast<APlayerCharacter>(OtherActor))
+	// TODO: Add Gold to player Gold component
-	{
+	
-		PlayerCharacter->GetGoldComponent()->IncrementGold(Gold);
+	Super::OnBeginOverlap(OverlappedComponent, OtherActor, OtherComp, OtherBodyIndex, bFromSweep, SweepResult);
-		Super::OnBeginOverlap(OverlappedComponent, OtherActor, OtherComp, OtherBodyIndex, bFromSweep, SweepResult);
-	}
 }

Source/vampires/GoldPickup.h

@@ -14,11 +14,6 @@ class VAMPIRES_API AGoldPickup : public APickup
 {
 	GENERATED_BODY()
 
-public:
-
-	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
-	int Gold = 1;
-	
 protected:
 	virtual void BeginPlay() override;
 

Source/vampires/PlayerCharacter.cpp

@@ -74,16 +74,6 @@ void APlayerCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputCom
 	}
 }
 
-UEXPComponent* APlayerCharacter::GetEXPComponent()
-{
-	return EXPComponent;
-}
-
-UGoldComponent* APlayerCharacter::GetGoldComponent()
-{
-	return GoldComponent;
-}
-
 void APlayerCharacter::MovementCallback(const FInputActionInstance& Instance)
 {
 	FVector2D vec2 = Instance.GetValue().Get<FVector2D>();

Source/vampires/PlayerCharacter.h

@@ -67,10 +67,6 @@ protected:
 public:
 	virtual void SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) override;
 
-	UEXPComponent* GetEXPComponent();
-
-	UGoldComponent* GetGoldComponent();
-
 private:
 	UFUNCTION()
 	void MovementCallback(const FInputActionInstance& Instance);