From 60bf490f8a82ff278cea58d023a33dcb4369eafb Mon Sep 17 00:00:00 2001
From: baz <bazzadobs@live.co.uk>
Date: Wed, 20 Sep 2023 01:56:13 +0100
Subject: [PATCH] Update ThrowableInventory type

---
 Content/Throwables/Test.uasset        | 3 +++
 Content/Throwables/Throww.uasset      | 3 +++
 Content/Throwables/reee.uasset        | 3 +++
 Source/Nakatomi/NakatomiCharacter.cpp | 4 ++--
 Source/Nakatomi/NakatomiCharacter.h   | 8 ++++----
 5 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 Content/Throwables/Test.uasset
 create mode 100644 Content/Throwables/Throww.uasset
 create mode 100644 Content/Throwables/reee.uasset

diff --git a/Content/Throwables/Test.uasset b/Content/Throwables/Test.uasset
new file mode 100644
index 0000000..2f01880
--- /dev/null
+++ b/Content/Throwables/Test.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a2e1ef6001a9f7754f4e4c2247a1329b69d4e8faf9f4f3e7869fa3ae2def662
+size 33326
diff --git a/Content/Throwables/Throww.uasset b/Content/Throwables/Throww.uasset
new file mode 100644
index 0000000..d03b184
--- /dev/null
+++ b/Content/Throwables/Throww.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bf40fa44a7e7e39170f7ef44fbb3f7f22102615b1bdf786d6b7a0efe5d9e6dd1
+size 33453
diff --git a/Content/Throwables/reee.uasset b/Content/Throwables/reee.uasset
new file mode 100644
index 0000000..1ae1c01
--- /dev/null
+++ b/Content/Throwables/reee.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:004c092abc53e28758e8be708a14b16601f6eb5948a403d59cbda422f0e584dd
+size 33330
diff --git a/Source/Nakatomi/NakatomiCharacter.cpp b/Source/Nakatomi/NakatomiCharacter.cpp
index 0824d72..9c2afdd 100644
--- a/Source/Nakatomi/NakatomiCharacter.cpp
+++ b/Source/Nakatomi/NakatomiCharacter.cpp
@@ -214,7 +214,7 @@ void ANakatomiCharacter::OnFire()
 	OnFired.ExecuteIfBound();
 }
 
-AThrowable* ANakatomiCharacter::PopThrowableFromInventory()
+TSubclassOf<AThrowable> ANakatomiCharacter::PopThrowableFromInventory()
 {
 	if (ThrowableInventory.Num() > 0)
 	{
@@ -224,7 +224,7 @@ AThrowable* ANakatomiCharacter::PopThrowableFromInventory()
 	return {};
 }
 
-void ANakatomiCharacter::PushThrowableToInventory(AThrowable* Throwable)
+void ANakatomiCharacter::PushThrowableToInventory(TSubclassOf<AThrowable> Throwable)
 {
 	if (ThrowableInventory.Num() < MaximumThrowableInventorySize)
 	{
diff --git a/Source/Nakatomi/NakatomiCharacter.h b/Source/Nakatomi/NakatomiCharacter.h
index 22e9498..0c368f1 100644
--- a/Source/Nakatomi/NakatomiCharacter.h
+++ b/Source/Nakatomi/NakatomiCharacter.h
@@ -35,8 +35,8 @@ public:
 	UPROPERTY()
 	AWeapon* CurrentWeapon = nullptr;
 
-	UPROPERTY()
-	TArray<AThrowable*> ThrowableInventory;
+	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
+	TArray<TSubclassOf<AThrowable>> ThrowableInventory;
 
 private:
 	UPROPERTY(VisibleDefaultsOnly)
@@ -94,9 +94,9 @@ public:
 
 	virtual void OnFire();
 
-	AThrowable* PopThrowableFromInventory();
+	TSubclassOf<AThrowable> PopThrowableFromInventory();
 
-	void PushThrowableToInventory(AThrowable* Throwable);
+	void PushThrowableToInventory(TSubclassOf<AThrowable> Throwable);
 
 protected:
 	virtual void CalculateHits(TArray<FHitResult>* hits);