From b2390124117669ae667aa07b782972ab8033f8c3 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Mon, 16 Oct 2023 16:14:23 +0100 Subject: [PATCH] Added Reload Text To Weapons When Reloading --- .../FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset | 4 ++-- .../FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset | 4 ++-- .../Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp | 3 ++- .../Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h | 6 ++++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset index e3885a88..f2c7b766 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1de9565906296c664bb7dd6b3f700d135fa5244e1f625f9f792eba15a9880ae8 -size 48226 +oid sha256:754ba6fc86e8d96dbe2fade3d515f45b10eefd1e3c7ac9115658daa2b251622e +size 76327 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset index 1d67df8a..5f03829f 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cfd791337f79a964dbfef919494665648f1ce39168d4f28cd122e2018c4b694 -size 61741 +oid sha256:1b199cbe84b6c49806f9646990c9c60ff7199214add19091ea0d7a47896daf53 +size 64350 diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp index c053413b..6db24720 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp @@ -216,7 +216,7 @@ void ABaseWeaponClass::WeaponScopedFire() void ABaseWeaponClass::ReloadTimer() { GetWorldTimerManager().SetTimer(reloadTimerHandle, this, &ABaseWeaponClass::WeaponReload, TimeToReload, false); - GLog->Log("ReloadTimer Activated"); + ShowReloadingWidget(); } void ABaseWeaponClass::WeaponReload() @@ -226,6 +226,7 @@ void ABaseWeaponClass::WeaponReload() UE_LOG(LogTemp, Display, TEXT("Weapon Reloading: mag size: %d"), MagazineSize); currentAmmoCount = MagazineSize; endlessVendettaChar->bIsReloading = false; + HideReloadingWidget(); } } diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h index 82e7c1bd..72ad7ed4 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h @@ -41,6 +41,12 @@ protected: float recoilResultPitch = 0; float recoilResultYaw = 0; + UFUNCTION(BlueprintImplementableEvent) + void ShowReloadingWidget(); + + UFUNCTION(BlueprintImplementableEvent) + void HideReloadingWidget(); + public: