Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Grenades - Remove ref to missing audio #7928

Merged
merged 2 commits into from Oct 9, 2020
Merged

Grenades - Remove ref to missing audio #7928

merged 2 commits into from Oct 9, 2020

Conversation

Cyruz143
Copy link
Contributor

@Cyruz143 Cyruz143 commented Oct 2, 2020

When merged this pull request will:

  • Fixes issues when building @Dahlgren 's nightly by removing references to missing audio files
  • Tested in-game, still has audio and no RPT errors
z\ace\addons\grenades\CfgAmmo.hpp circa Line 181: A3\Sounds_F\arsenal\explosives\bombs\Explosion_satchel_01
z\ace\addons\grenades\CfgAmmo.hpp circa Line 182: A3\Sounds_F\arsenal\explosives\bombs\Explosion_satchel_02
z\ace\addons\grenades\CfgAmmo.hpp circa Line 210: A3\Sounds_F\arsenal\explosives\bombs\Explosive_Charge

@Dahlgren
Copy link
Member

Dahlgren commented Oct 2, 2020

Perhaps remove the invalid files from tools/pDummies/A3/sounds_f/arsenal/explosives/bombs as well

@commy2
Copy link
Contributor

commy2 commented Oct 2, 2020

Why not fix the paths instead?

@Cyruz143
Copy link
Contributor Author

Cyruz143 commented Oct 2, 2020

Why not fix the paths instead?

Files don't exist in vanilla pbos anymore.

@commy2
Copy link
Contributor

commy2 commented Oct 3, 2020

Then use whatever sound the satchel is using now?

@@ -178,8 +178,6 @@ class CfgAmmo {
indirectHit = 3000;
indirectHitRange = 5;
defaultMagazine = "ACE_SatchelCharge_Remote_Mag_Throwable";
soundHit1[] = {"A3\Sounds_F\arsenal\explosives\bombs\Explosion_satchel_01", 3.16228, 1, 1500};
soundHit2[] = {"A3\Sounds_F\arsenal\explosives\bombs\Explosion_satchel_02", 3.16228, 1, 1500};
multiSoundHit[] = {"soundHit1", 0.5, "soundHit2", 0.5};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this still there then?

@commy2
Copy link
Contributor

commy2 commented Oct 3, 2020

This is inherited:

    class Grenade: Default {
        soundHit1[] = {"A3\Sounds_F\arsenal\explosives\grenades\Explosion_HE_grenade_01",2.51189,1,1500};
        soundHit2[] = {"A3\Sounds_F\arsenal\explosives\grenades\Explosion_HE_grenade_02",2.51189,1,1500};
        soundHit3[] = {"A3\Sounds_F\arsenal\explosives\grenades\Explosion_HE_grenade_03",2.51189,1,1500};
        soundHit4[] = {"A3\Sounds_F\arsenal\explosives\grenades\Explosion_HE_grenade_04",2.51189,1,1500};
        multiSoundHit[] = {"soundHit1",0.25,"soundHit2",0.25,"soundHit3",0.25,"soundHit4",0.25};

@jonpas jonpas added area/tools kind/bug-fix Release Notes: **FIXED:** labels Oct 5, 2020
@jonpas jonpas added this to the 3.13.5 milestone Oct 5, 2020
Copy link
Member

@jonpas jonpas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to merge to push forward CI builds currently being worked on. General cleanup of those sounds can happen in another PR.

@PabstMirror PabstMirror changed the title Remove ref to missing audio Grenades - Remove ref to missing audio Oct 9, 2020
@PabstMirror PabstMirror merged commit d19bdce into acemod:master Oct 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/tools kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants