From 97c937d21256d10f89634329c4b457d0fb810e7f Mon Sep 17 00:00:00 2001 From: Louis Hobbs Date: Tue, 31 Jan 2023 21:26:45 +0000 Subject: [PATCH] Add `NakatomiFieldSystemActor` to `Weapon` --- Source/Nakatomi/Weapon.cpp | 5 +++++ Source/Nakatomi/Weapon.h | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/Source/Nakatomi/Weapon.cpp b/Source/Nakatomi/Weapon.cpp index d9bf82c..43cca20 100644 --- a/Source/Nakatomi/Weapon.cpp +++ b/Source/Nakatomi/Weapon.cpp @@ -116,3 +116,8 @@ void AWeapon::DecrementAmmoCount(int ammoCount) AmmoCount = 0; } } + +TSubclassOf AWeapon::GetFieldSystemActor() +{ + return FieldSystemActor; +} diff --git a/Source/Nakatomi/Weapon.h b/Source/Nakatomi/Weapon.h index ea5d218..048a25c 100644 --- a/Source/Nakatomi/Weapon.h +++ b/Source/Nakatomi/Weapon.h @@ -4,9 +4,11 @@ #include "CoreMinimal.h" #include "GameFramework/Actor.h" +#include "NakatomiFieldSystemActor.h" #include "Weapon.generated.h" class ANakatomiCharacter; +class ANakatomiFieldSystemActor; UENUM() enum WeaponState @@ -75,6 +77,9 @@ protected: UPROPERTY(VisibleAnywhere) int AmmoCount; + UPROPERTY(EditDefaultsOnly) + TSubclassOf FieldSystemActor; + public: // Sets default values for this actor's properties AWeapon(); @@ -115,4 +120,6 @@ public: void IncrementAmmoCount(int ammoCount); void DecrementAmmoCount(int ammoCount); + + TSubclassOf GetFieldSystemActor(); };