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

Add logic to throw weapon once weapon ammo is depleted

This commit is contained in:
baz 2023-09-23 21:10:15 +01:00
parent 7f4de48fb0
commit 12db67439f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Nakatomi/PlayerCharacter.cpp
View File

@ -219,6 +219,12 @@ void APlayerCharacter::BeginFireCallback(const FInputActionInstance& Instance)
return; return;
} }
if (CurrentWeapon->GetAmmoCount() == 0)
{
ThrowWeaponCallback();
return;
}
IsFiring = true; IsFiring = true;
OnFire(); OnFire();
@ -478,7 +484,7 @@ void APlayerCharacter::EndAimDownSightsCallback(const FInputActionInstance& Inst
void APlayerCharacter::OnFire() void APlayerCharacter::OnFire()
{ {
if (!IsFiring) if (!IsFiring || CurrentWeapon->GetAmmoCount() == 0)
{ {
return; return;
} }
@ -497,11 +503,6 @@ void APlayerCharacter::OnFire()
CurrentWeapon->SetCurrentWeaponStatus(Cooldown); CurrentWeapon->SetCurrentWeaponStatus(Cooldown);
if (CurrentWeapon->GetAmmoCount() == 0)
{
RemoveCurrentWeaponFromInventory();
}
Super::OnFire(); Super::OnFire();
} }
@ -511,7 +512,7 @@ void APlayerCharacter::WeaponCooldownHandler()
{ {
CurrentWeapon->SetCurrentWeaponStatus(Idle); CurrentWeapon->SetCurrentWeaponStatus(Idle);
} }
if (!IsFiring) if (!IsFiring)
{ {
GetWorldTimerManager().ClearTimer(FireTimerHandle); GetWorldTimerManager().ClearTimer(FireTimerHandle);
@ -592,6 +593,8 @@ void APlayerCharacter::ThrowWeaponCallback()
Throwable->SetWeaponSkeletalMesh(GetCurrentWeapon()->GetSkeletalMesh()); Throwable->SetWeaponSkeletalMesh(GetCurrentWeapon()->GetSkeletalMesh());
} }
RemoveCurrentWeaponFromInventory();
} }
void APlayerCharacter::ThrowExplosiveCallback() void APlayerCharacter::ThrowExplosiveCallback()