Merge movement-component #1

Merged
baz merged 20 commits from movement-component into master 2024-01-18 18:30:17 +01:00
2 changed files with 9 additions and 0 deletions
Showing only changes of commit 08fbe9dbe1 - Show all commits

View File

@ -25,6 +25,8 @@ void ANakatomiCharacter::BeginPlay()
Super::BeginPlay(); Super::BeginPlay();
SetInventoryToDefault(); SetInventoryToDefault();
NakatomiCMC = Cast<UNakatomiCMC>(GetCharacterMovement());
} }
// Called every frame // Called every frame
@ -237,6 +239,11 @@ void ANakatomiCharacter::PushThrowableToInventory(TSubclassOf<AThrowable> Throwa
} }
} }
UNakatomiCMC* ANakatomiCharacter::GetCharacterMovementComponent()
{
return NakatomiCMC;
}
void ANakatomiCharacter::CalculateHits(TArray<FHitResult>* hits) void ANakatomiCharacter::CalculateHits(TArray<FHitResult>* hits)
{ {
} }

View File

@ -104,6 +104,8 @@ public:
void PushThrowableToInventory(TSubclassOf<AThrowable> Throwable); void PushThrowableToInventory(TSubclassOf<AThrowable> Throwable);
UNakatomiCMC* GetCharacterMovementComponent();
protected: protected:
virtual void CalculateHits(TArray<FHitResult>* hits); virtual void CalculateHits(TArray<FHitResult>* hits);