From 2b5670fa9a6f7684d938ec1d828543522244c708 Mon Sep 17 00:00:00 2001
From: baz <bazzadobs@live.co.uk>
Date: Mon, 5 Feb 2024 21:36:44 +0000
Subject: [PATCH] Make Manequin Animation Blueprint generic

---
 .../Animations/AnimStarterPack/ABP/ABP_Manequin.uasset |  4 ++--
 Source/Nakatomi/NakatomiCharacter.cpp                  | 10 ++++++++++
 Source/Nakatomi/NakatomiCharacter.h                    |  3 +++
 Source/Nakatomi/PlayerCharacter.cpp                    | 10 ----------
 Source/Nakatomi/PlayerCharacter.h                      |  3 ---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Content/Animations/AnimStarterPack/ABP/ABP_Manequin.uasset b/Content/Animations/AnimStarterPack/ABP/ABP_Manequin.uasset
index e254382..7ac89d5 100644
--- a/Content/Animations/AnimStarterPack/ABP/ABP_Manequin.uasset
+++ b/Content/Animations/AnimStarterPack/ABP/ABP_Manequin.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5121bafc23f4465defd4b65f25423e7779f5556a30c370da0405c1e55edae2f0
-size 691430
+oid sha256:2269f4385a84f8efacf03ebbff4481f398899b1c9bf5bf2a6f821b12699872bb
+size 690172
diff --git a/Source/Nakatomi/NakatomiCharacter.cpp b/Source/Nakatomi/NakatomiCharacter.cpp
index 4f1e224..dd1ccb2 100644
--- a/Source/Nakatomi/NakatomiCharacter.cpp
+++ b/Source/Nakatomi/NakatomiCharacter.cpp
@@ -244,6 +244,16 @@ UNakatomiCMC* ANakatomiCharacter::GetCharacterMovementComponent()
 	return NakatomiCMC;
 }
 
+bool ANakatomiCharacter::GetCrouched()
+{
+	if (UNakatomiCMC* cmc = GetCharacterMovementComponent())
+	{
+		return cmc->IsCrouching();
+	}
+	
+	return false;
+}
+
 void ANakatomiCharacter::CalculateHits(TArray<FHitResult>* hits)
 {
 }
diff --git a/Source/Nakatomi/NakatomiCharacter.h b/Source/Nakatomi/NakatomiCharacter.h
index 574f69d..7f0c531 100644
--- a/Source/Nakatomi/NakatomiCharacter.h
+++ b/Source/Nakatomi/NakatomiCharacter.h
@@ -106,6 +106,9 @@ public:
 
 	UNakatomiCMC* GetCharacterMovementComponent();
 
+	UFUNCTION(BlueprintCallable)
+	bool GetCrouched();
+
 protected:
 	virtual void CalculateHits(TArray<FHitResult>* hits);
 
diff --git a/Source/Nakatomi/PlayerCharacter.cpp b/Source/Nakatomi/PlayerCharacter.cpp
index cf41545..84cf25a 100644
--- a/Source/Nakatomi/PlayerCharacter.cpp
+++ b/Source/Nakatomi/PlayerCharacter.cpp
@@ -779,16 +779,6 @@ bool APlayerCharacter::GetPressedJump()
 	return jumpPressed;
 }
 
-bool APlayerCharacter::GetCrouched()
-{
-	if (UNakatomiCMC* cmc = GetCharacterMovementComponent())
-	{
-		return cmc->IsCrouching();
-	}
-	
-	return false;
-}
-
 bool APlayerCharacter::GetIsThrowing()
 {
 	return IsThrowing;
diff --git a/Source/Nakatomi/PlayerCharacter.h b/Source/Nakatomi/PlayerCharacter.h
index 968a2f5..c9b0e3d 100644
--- a/Source/Nakatomi/PlayerCharacter.h
+++ b/Source/Nakatomi/PlayerCharacter.h
@@ -236,9 +236,6 @@ public:
 	UFUNCTION(BlueprintCallable)
 	bool GetPressedJump();
 
-	UFUNCTION(BlueprintCallable)
-	bool GetCrouched();
-
 	UFUNCTION(BlueprintCallable)
 	bool GetIsThrowing();