From 7c803eb3ff7a546fb826626a86f47bc11777059b Mon Sep 17 00:00:00 2001 From: baz Date: Mon, 18 Sep 2023 01:09:08 +0100 Subject: [PATCH] Add WeaponThrowable Template to Weapon --- Source/Nakatomi/Weapon.cpp | 5 +++++ Source/Nakatomi/Weapon.h | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/Source/Nakatomi/Weapon.cpp b/Source/Nakatomi/Weapon.cpp index 73cdc01..9afcbdf 100644 --- a/Source/Nakatomi/Weapon.cpp +++ b/Source/Nakatomi/Weapon.cpp @@ -115,6 +115,11 @@ void AWeapon::DecrementAmmoCount(int ammoCount) } } +TSubclassOf AWeapon::GetWeaponThrowableTemplate() +{ + return WeaponThrowableTemplate; +} + TSubclassOf AWeapon::GetFieldSystemActor() { return FieldSystemActor; diff --git a/Source/Nakatomi/Weapon.h b/Source/Nakatomi/Weapon.h index f5734a8..09c6d4b 100644 --- a/Source/Nakatomi/Weapon.h +++ b/Source/Nakatomi/Weapon.h @@ -6,6 +6,7 @@ #include "GameFramework/Actor.h" #include "NakatomiFieldSystemActor.h" #include "WeaponProperties.h" +#include "WeaponThrowable.h" #include "Weapon.generated.h" class ANakatomiCharacter; @@ -47,6 +48,9 @@ protected: UPROPERTY(EditDefaultsOnly) TSubclassOf FieldSystemActor; + UPROPERTY(EditDefaultsOnly) + TSubclassOf WeaponThrowableTemplate; + public: // Sets default values for this actor's properties AWeapon(); @@ -89,4 +93,6 @@ public: void DecrementAmmoCount(int ammoCount); TSubclassOf GetFieldSystemActor(); + + TSubclassOf GetWeaponThrowableTemplate(); };