Merge movement-component #1
|
@ -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)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
@ -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);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue