From 9b95f5abfd06ed5dabf4349bba49ac1cad3521f0 Mon Sep 17 00:00:00 2001 From: TjgL Date: Thu, 13 Mar 2025 22:15:31 +0100 Subject: [PATCH] Replaced unreal sound by fmod events Signed-off-by: TjgL --- Content/FMOD/Desktop/Master.bank | 4 ++-- Content/FMOD/Desktop/Master.strings.bank | 4 ++-- Content/Legumix/Weapon/Revolver/BP_Revolver.uasset | 4 ++-- Content/Legumix/Weapon/Shotgun/BP_Shotgun.uasset | 4 ++-- Source/LegumeMix/Private/Weapon/LMRevolver.cpp | 2 +- Source/LegumeMix/Private/Weapon/LMShotgun.cpp | 2 +- Source/LegumeMix/Private/Weapon/LMWeaponBase.cpp | 2 +- Source/LegumeMix/Public/Weapon/LMWeaponBase.h | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Content/FMOD/Desktop/Master.bank b/Content/FMOD/Desktop/Master.bank index 8a229f9..a920a9b 100644 --- a/Content/FMOD/Desktop/Master.bank +++ b/Content/FMOD/Desktop/Master.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:287c89e4d3fae751511ef62345046b33f4c662dd4e0c8b00e87a0f7475477dfa -size 54400 +oid sha256:e323b4ba1ca2e71a5ba40a4d2c8fa7aae1887367c135340266247ba246d30b46 +size 57600 diff --git a/Content/FMOD/Desktop/Master.strings.bank b/Content/FMOD/Desktop/Master.strings.bank index af62382..4353e74 100644 --- a/Content/FMOD/Desktop/Master.strings.bank +++ b/Content/FMOD/Desktop/Master.strings.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:110f92ee68af102c53a230aac2f3b7127ca5d2b6a8e538033b438903d06d8df9 -size 1052 +oid sha256:4d6822a5a948507cb9a44d7f32dcdffab34b7eac0a2bc26fbc7cac1e53353f73 +size 1210 diff --git a/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset b/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset index 9d93ae0..8448106 100644 --- a/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset +++ b/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85b15b89710fd971ed34c03cf3008ffeb6b733303edab884705871a8ea2627a9 -size 40230 +oid sha256:5a698d15bf0250c193bf03a6dc921c8fd1944998b466396be5e2dbda4b808704 +size 40517 diff --git a/Content/Legumix/Weapon/Shotgun/BP_Shotgun.uasset b/Content/Legumix/Weapon/Shotgun/BP_Shotgun.uasset index 58560b4..2b08831 100644 --- a/Content/Legumix/Weapon/Shotgun/BP_Shotgun.uasset +++ b/Content/Legumix/Weapon/Shotgun/BP_Shotgun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ba0ce0757e3b7896aa266a52b280bc36d52fc76040ea43cd34adda05d0bf5cf -size 41315 +oid sha256:02d1bf7111076147ad6b293ea9f6b2c420ad1469d95bde56576b5b45d5b2297b +size 41595 diff --git a/Source/LegumeMix/Private/Weapon/LMRevolver.cpp b/Source/LegumeMix/Private/Weapon/LMRevolver.cpp index c965fa8..3c20818 100644 --- a/Source/LegumeMix/Private/Weapon/LMRevolver.cpp +++ b/Source/LegumeMix/Private/Weapon/LMRevolver.cpp @@ -24,7 +24,7 @@ void ALMRevolver::PrimaryFire() { if (!Reload()) { - PlaySound(DryFireSound, true); + PlayEvent(DryFireSound); GetWorldTimerManager().SetTimer(FireTimer, this, &ALMRevolver::AllowRefire, RefireDelay / 2); } return; diff --git a/Source/LegumeMix/Private/Weapon/LMShotgun.cpp b/Source/LegumeMix/Private/Weapon/LMShotgun.cpp index fe64093..4f81507 100644 --- a/Source/LegumeMix/Private/Weapon/LMShotgun.cpp +++ b/Source/LegumeMix/Private/Weapon/LMShotgun.cpp @@ -24,7 +24,7 @@ void ALMShotgun::PrimaryFire() { if (!Reload()) { - PlaySound(DryFireSound, true); + PlayEvent(DryFireSound); GetWorldTimerManager().SetTimer(FireTimer, this, &ALMShotgun::AllowRefire, RefireDelay / 2); } return; diff --git a/Source/LegumeMix/Private/Weapon/LMWeaponBase.cpp b/Source/LegumeMix/Private/Weapon/LMWeaponBase.cpp index c6308f1..bb66721 100644 --- a/Source/LegumeMix/Private/Weapon/LMWeaponBase.cpp +++ b/Source/LegumeMix/Private/Weapon/LMWeaponBase.cpp @@ -47,7 +47,7 @@ void ALMWeaponBase::Setup(USkeletalMeshComponent* Mesh, AActor* CharOwner) void ALMWeaponBase::OnEquip_Implementation() { - PlaySound(EquipSound); + PlayEvent(EquipSound); } bool ALMWeaponBase::Reload() diff --git a/Source/LegumeMix/Public/Weapon/LMWeaponBase.h b/Source/LegumeMix/Public/Weapon/LMWeaponBase.h index 5ac21c3..f1694ef 100644 --- a/Source/LegumeMix/Public/Weapon/LMWeaponBase.h +++ b/Source/LegumeMix/Public/Weapon/LMWeaponBase.h @@ -80,10 +80,10 @@ protected: /* Weapon Data */ TObjectPtr ReloadSound; UPROPERTY(EditAnywhere, BlueprintReadWrite,Category="Legumix|Sounds") - TObjectPtr DryFireSound; + TObjectPtr DryFireSound; UPROPERTY(EditAnywhere, BlueprintReadWrite,Category="Legumix|Sounds") - TObjectPtr EquipSound; + TObjectPtr EquipSound; UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Legumix|Animations", meta=(AllowPrivateAccess=true)) TObjectPtr PrimaryFireAnimation;