From f7216d25f97c288df7754b9c068472c59322c0bf Mon Sep 17 00:00:00 2001 From: Louis Hobbs Date: Mon, 13 Mar 2023 21:56:23 +0000 Subject: [PATCH] Change `CalculateHits` and `ProcessHits` from public to protected --- Source/Nakatomi/NakatomiCharacter.cpp | 2 +- Source/Nakatomi/NakatomiCharacter.h | 4 +++- Source/Nakatomi/PlayerCharacter.h | 10 ++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Source/Nakatomi/NakatomiCharacter.cpp b/Source/Nakatomi/NakatomiCharacter.cpp index 033c8e0..551e62a 100644 --- a/Source/Nakatomi/NakatomiCharacter.cpp +++ b/Source/Nakatomi/NakatomiCharacter.cpp @@ -212,6 +212,6 @@ void ANakatomiCharacter::CalculateHits(TArray* hits) { } -void ANakatomiCharacter::ProcessHits(TArray* hits) +void ANakatomiCharacter::ProcessHits(TArray hits) { } diff --git a/Source/Nakatomi/NakatomiCharacter.h b/Source/Nakatomi/NakatomiCharacter.h index 84b4627..bd43fa5 100644 --- a/Source/Nakatomi/NakatomiCharacter.h +++ b/Source/Nakatomi/NakatomiCharacter.h @@ -79,7 +79,9 @@ public: int GetCurrentInventorySlot(); +protected: + virtual void CalculateHits(TArray* hits); - virtual void ProcessHits(TArray* hits); + virtual void ProcessHits(TArray hits); }; diff --git a/Source/Nakatomi/PlayerCharacter.h b/Source/Nakatomi/PlayerCharacter.h index 731fc3a..9a06286 100644 --- a/Source/Nakatomi/PlayerCharacter.h +++ b/Source/Nakatomi/PlayerCharacter.h @@ -114,10 +114,6 @@ public: void SetWalkingCallback(const FInputActionInstance& Instance); - virtual void CalculateHits(TArray* hits) override; - - virtual void ProcessHits(TArray hits) override; - void WeaponSwitchingCallback(const FInputActionInstance& Instance); void OnFire(); @@ -131,4 +127,10 @@ public: UFUNCTION(BlueprintCallable) float GetCurrentHealthCount(); + +protected: + + virtual void CalculateHits(TArray* hits) override; + + virtual void ProcessHits(TArray hits) override; };