From 60deefdf96165104d13aa18e555e5bc977e339b8 Mon Sep 17 00:00:00 2001 From: Louis Hobbs Date: Mon, 13 Mar 2023 22:01:21 +0000 Subject: [PATCH] Make `OnFire` a virtual function --- Source/Nakatomi/NakatomiCharacter.cpp | 4 ++++ Source/Nakatomi/NakatomiCharacter.h | 2 ++ Source/Nakatomi/PlayerCharacter.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Source/Nakatomi/NakatomiCharacter.cpp b/Source/Nakatomi/NakatomiCharacter.cpp index 551e62a..624c3ff 100644 --- a/Source/Nakatomi/NakatomiCharacter.cpp +++ b/Source/Nakatomi/NakatomiCharacter.cpp @@ -208,6 +208,10 @@ int ANakatomiCharacter::GetCurrentInventorySlot() return CurrentInventorySlot; } +void ANakatomiCharacter::OnFire() +{ +} + void ANakatomiCharacter::CalculateHits(TArray* hits) { } diff --git a/Source/Nakatomi/NakatomiCharacter.h b/Source/Nakatomi/NakatomiCharacter.h index bd43fa5..09105ce 100644 --- a/Source/Nakatomi/NakatomiCharacter.h +++ b/Source/Nakatomi/NakatomiCharacter.h @@ -79,6 +79,8 @@ public: int GetCurrentInventorySlot(); + virtual void OnFire(); + protected: virtual void CalculateHits(TArray* hits); diff --git a/Source/Nakatomi/PlayerCharacter.h b/Source/Nakatomi/PlayerCharacter.h index 9a06286..f8cffec 100644 --- a/Source/Nakatomi/PlayerCharacter.h +++ b/Source/Nakatomi/PlayerCharacter.h @@ -116,7 +116,7 @@ public: void WeaponSwitchingCallback(const FInputActionInstance& Instance); - void OnFire(); + virtual void OnFire() override; void WeaponCooldownHandler();