168 - Drop the Secondary Weapon
This commit is contained in:
parent
0e9dd966c7
commit
8f24aab496
|
@ -84,10 +84,8 @@ void ABlasterCharacter::OnRep_ReplicatedMovement()
|
||||||
|
|
||||||
void ABlasterCharacter::Eliminated()
|
void ABlasterCharacter::Eliminated()
|
||||||
{
|
{
|
||||||
if (Combat && Combat->PrimaryWeapon)
|
if (Combat) Combat->DropWeapons();
|
||||||
{
|
|
||||||
Combat->PrimaryWeapon->Dropped();
|
|
||||||
}
|
|
||||||
MulticastEliminated();
|
MulticastEliminated();
|
||||||
GetWorldTimerManager().SetTimer(
|
GetWorldTimerManager().SetTimer(
|
||||||
EliminationTimer,
|
EliminationTimer,
|
||||||
|
|
|
@ -325,6 +325,12 @@ void UCombatComponent::Reload()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void UCombatComponent::DropWeapons()
|
||||||
|
{
|
||||||
|
if (PrimaryWeapon) PrimaryWeapon->Dropped();
|
||||||
|
if (SecondaryWeapon) SecondaryWeapon->Dropped();
|
||||||
|
}
|
||||||
|
|
||||||
void UCombatComponent::ServerReload_Implementation()
|
void UCombatComponent::ServerReload_Implementation()
|
||||||
{
|
{
|
||||||
if (Character == nullptr || PrimaryWeapon == nullptr) return;
|
if (Character == nullptr || PrimaryWeapon == nullptr) return;
|
||||||
|
|
|
@ -25,6 +25,7 @@ public:
|
||||||
void EquipWeapon(class AWeapon* WeaponToEquip);
|
void EquipWeapon(class AWeapon* WeaponToEquip);
|
||||||
void SwapWeapons();
|
void SwapWeapons();
|
||||||
void Reload();
|
void Reload();
|
||||||
|
void DropWeapons();
|
||||||
UFUNCTION(BlueprintCallable)
|
UFUNCTION(BlueprintCallable)
|
||||||
void FinishedReloading();
|
void FinishedReloading();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue