baz/Nakatomi
baz
/
Nakatomi
1
0
Fork 0
Code Issues Pull Requests Activity

Disallow Sprinting and Aiming Downsights at the same time

This commit is contained in:
baz 2024-03-05 15:32:32 +00:00
parent 23db1dff33
commit 91f2befa71
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Nakatomi/PlayerCharacter.cpp
View File

@ -298,22 +298,24 @@ void APlayerCharacter::QuitCallback(const FInputActionInstance& Instance)
void APlayerCharacter::SetSprintingCallback(const FInputActionInstance& Instance) void APlayerCharacter::SetSprintingCallback(const FInputActionInstance& Instance)
{ {
if (UNakatomiCMC* cmc = GetCharacterMovementComponent()) UNakatomiCMC* cmc = GetCharacterMovementComponent();
if (!IsADS && cmc)
{ {
cmc->EnableSprint(); cmc->EnableSprint();
IsSprinting = true;
} }
IsSprinting = true;
} }
void APlayerCharacter::SetWalkingCallback(const FInputActionInstance& Instance) void APlayerCharacter::SetWalkingCallback(const FInputActionInstance& Instance)
{ {
if (UNakatomiCMC* cmc = GetCharacterMovementComponent()) UNakatomiCMC* cmc = GetCharacterMovementComponent();
if (!IsADS && cmc)
{ {
cmc->DisableSprint(); cmc->DisableSprint();
IsSprinting = false;
} }
IsSprinting = false;
} }
void APlayerCharacter::CalculateHits(TArray<FHitResult>* hits) void APlayerCharacter::CalculateHits(TArray<FHitResult>* hits)
@ -518,13 +520,18 @@ void APlayerCharacter::WeaponSwitchingCallback(const FInputActionInstance& Insta
void APlayerCharacter::BeginAimDownSightsCallback(const FInputActionInstance& Instance) void APlayerCharacter::BeginAimDownSightsCallback(const FInputActionInstance& Instance)
{ {
IsADS = true; if (IsSprinting)
{
return;
}
IsADS = true;
if (UNakatomiCMC* cmc = GetCharacterMovementComponent()) if (UNakatomiCMC* cmc = GetCharacterMovementComponent())
{ {
cmc->EnableAds(); cmc->EnableAds();
} }
AimSensitivity = DefaultAimSensitivity * ADSAimSensitivityMultiplier; AimSensitivity = DefaultAimSensitivity * ADSAimSensitivityMultiplier;
if (CurrentWeapon) if (CurrentWeapon)
@ -544,6 +551,11 @@ void APlayerCharacter::BeginAimDownSightsCallback(const FInputActionInstance& In
void APlayerCharacter::EndAimDownSightsCallback(const FInputActionInstance& Instance) void APlayerCharacter::EndAimDownSightsCallback(const FInputActionInstance& Instance)
{ {
if (IsSprinting)
{
return;
}
IsADS = false; IsADS = false;
if (UNakatomiCMC* cmc = GetCharacterMovementComponent()) if (UNakatomiCMC* cmc = GetCharacterMovementComponent())