Source/Nakatomi/NakatomiCMC.cpp

@@ -5,11 +5,6 @@
 
 #include <GameFramework/Character.h>
 
-UNakatomiCMC::UNakatomiCMC(): Safe_bWantsToSprint(false)
-{
-	NavAgentProps.bCanCrouch = true;
-}
-
 // Checks if we can combine the NewMove with the current move to save on data.
 // If all the data in a saved move is identical, if true, we cam tell the server to run the existing move instead.
 bool UNakatomiCMC::FSavedMove_Nakatomi::CanCombineWith(const FSavedMovePtr& NewMove, ACharacter* InCharacter,
@@ -88,6 +83,10 @@ FNetworkPredictionData_Client* UNakatomiCMC::GetPredictionData_Client() const
 	return ClientPredictionData;
 }
 
+UNakatomiCMC::UNakatomiCMC(): Safe_bWantsToSprint(false)
+{
+}
+
 void UNakatomiCMC::UpdateFromCompressedFlags(uint8 Flags)
 {
 	Super::UpdateFromCompressedFlags(Flags);
@@ -120,14 +119,4 @@ void UNakatomiCMC::EnableSprint()
 void UNakatomiCMC::DisableSprint()
 {
 	Safe_bWantsToSprint = false;
-}
-
-void UNakatomiCMC::EnableCrouch()
-{
-	bWantsToCrouch = true;
-}
-
-void UNakatomiCMC::DisableCrouch()
-{
-	bWantsToCrouch = false;
-}
+}

Source/Nakatomi/NakatomiCMC.h

@@ -57,10 +57,4 @@ public:
 
 	UFUNCTION(BlueprintCallable)
 	void DisableSprint();
-
-	UFUNCTION(BlueprintCallable)
-	void EnableCrouch();
-
-	UFUNCTION(BlueprintCallable)
-	void DisableCrouch();
 };

Source/Nakatomi/NakatomiCharacter.cpp

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

Source/Nakatomi/NakatomiCharacter.h

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

Source/Nakatomi/PlayerCharacter.cpp

@@ -187,12 +187,6 @@ void APlayerCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputCom
 		{
 			Input->BindAction(PauseAction, ETriggerEvent::Completed, this, &APlayerCharacter::PauseCallback);
 		}
-
-		if (CrouchAction)
-		{
-			Input->BindAction(CrouchAction, ETriggerEvent::Started, this, &APlayerCharacter::BeginCrouchCallback);
-			Input->BindAction(CrouchAction, ETriggerEvent::Completed, this, &APlayerCharacter::EndCrouchCallback);
-		}
 	}
 }
 
@@ -274,21 +268,17 @@ void APlayerCharacter::QuitCallback(const FInputActionInstance& Instance)
 
 void APlayerCharacter::SetSprintingCallback(const FInputActionInstance& Instance)
 {
-	UNakatomiCMC* cmc = GetCharacterMovementComponent();
-	
-	if (cmc)
+	if (NakatomiCMC)
 	{
-		cmc->EnableSprint();
+		NakatomiCMC->EnableSprint();
 	}
 }
 
 void APlayerCharacter::SetWalkingCallback(const FInputActionInstance& Instance)
 {
-	UNakatomiCMC* cmc = GetCharacterMovementComponent();
-	
-	if (cmc)
+	if (NakatomiCMC)
 	{
-		cmc->DisableSprint();
+		NakatomiCMC->DisableSprint();
 	}
 }
 
@@ -546,26 +536,6 @@ void APlayerCharacter::PauseCallback(const FInputActionInstance& Instance)
 	}
 }
 
-void APlayerCharacter::BeginCrouchCallback(const FInputActionInstance& Instance)
-{
-	UNakatomiCMC* cmc = GetCharacterMovementComponent();
-	
-	if (cmc)
-	{
-		cmc->EnableCrouch();
-	}
-}
-
-void APlayerCharacter::EndCrouchCallback(const FInputActionInstance& Instance)
-{
-	UNakatomiCMC* cmc = GetCharacterMovementComponent();
-	
-	if (cmc)
-	{
-		cmc->DisableCrouch();
-	}
-}
-
 void APlayerCharacter::OnFire()
 {
 	if (!IsFiring || CurrentWeapon->GetAmmoCount() == 0)
@@ -714,4 +684,4 @@ AThrowable* APlayerCharacter::ThrowThrowable()
 	}
 
 	return nullptr;
-}
+}

Source/Nakatomi/PlayerCharacter.h

@@ -64,9 +64,6 @@ public:
 
 	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
 	UInputAction* AimDownSightsAction;
-
-	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
-	UInputAction* CrouchAction;
 	
 	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
 	TSoftObjectPtr<UInputMappingContext> InputMappingContext;
@@ -177,10 +174,6 @@ public:
 	void EndAimDownSightsCallback(const FInputActionInstance& Instance);
 
 	void PauseCallback(const FInputActionInstance& Instance);
-
-	void BeginCrouchCallback(const FInputActionInstance& Instance);
-
-	void EndCrouchCallback(const FInputActionInstance& Instance);
 	
 	virtual void OnFire() override;