Fix smash_fail calling null variant.

2 files changed, 38 insertions, 2 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4869373..93e4109 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
 pkgver=202202192349
 _pkgver=2022-02-19-2349
-pkgrel=1
+pkgrel=2
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -82,6 +82,8 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
 
         "recipes-01_4570-dragon-can-be-dismantled.patch"
 
+        "sound-01_fix-broken-smash-fail.patch"
+
         "terrain-03_tacoma-clinic-add-missing-floor.patch"
         "terrain-04_lumbermill-gasoline-not-spilled.patch"
         "terrain-05_community-garden-fertilizer-not-spilled.patch"
@@ -122,7 +124,6 @@ b2sums=('12f8b5dac86c42ca1207e854dd1682d7c617dfbd6e50d19eb47807a7ae062f757edfbfa
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
-        'efe8b9b633c4e707b05ed1e4656ccd5b1553d97f11a976f0771d1e8d67d09310552546defea2c66eb754ee7707baaca46bcf31f01252224a001b40b7ef77367d'
         '839c92715bfd1f63d94d6d252813a19e6093ded3e45f9efbbc4953ab85adfb886bcdfcfa41c9bb9ed422c0a32917a1ac75f98019e7de946b840e345cd3969d19'
         '5a33531c5742bbee44b1b3edec89cfceb6e0f161a5e0f0b131149fec010be4ab45095fdc558d0dd0023182cde66200f387f819aa392410dd317c0bc8dddb6294'
         '32f7c7090c094bcf87c116ccc4843f63c2f7600f591e26ab7d5a31d7c3abfcc5dec0edf5a9750dba07fe087c3880bbd6d322d0435ebbce06c930bd32c9c814d9'
@@ -158,6 +159,7 @@ b2sums=('12f8b5dac86c42ca1207e854dd1682d7c617dfbd6e50d19eb47807a7ae062f757edfbfa
         '9f34e372124b23bbc0598f42a1331f5a37f6ca4bfa3117d8b83fc804446a0d55f7fe3f462ff924bfa563100127338713bf27241a4244b1a37d9cca9b5da79bca'
         'adcf0b46ad57390488b3932910fba5a5be8152f91b45864bf078a2b8d92dc89e9944c320dafb7a0d4786e1fce48bedea714d671feefe565ffbbb74baca21d98e'
         '3373939e76f1ddb788b45424533c2e7687bbacae840fb3e6b1d49034e18315297af66dddf1b13d4f42033608123929b78819f38cca6cbc6c5ecca09bc67ab69f'
+        'ee51e67633252dc7af9117891dc1ece1bfa5f5660bdf665404747a756a828affcd072fa114e3911355bc38a2b6ce9e1e1156c5e5f4d33a3655750e08b2a4e6ae'
         'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e'
         '85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8'
         '58a94409205f7b670ab5745b8cbc234a38efd6a6217cef4efb7e397f091092e3e0c7790706b0a42accaa83d7509b8e244a98b9f0ba78349ee85f3164745c3501'
@@ -387,6 +389,12 @@ prepare() {
   patch -Np1 -i "$srcdir"/recipes-01_4570-dragon-can-be-dismantled.patch
 
 
+
+  echo "Applying sound fixes"
+  # Fix smash_fail not detecting variant type since gcc 11.2
+  patch -Np1 -i "$srcdir"/sound-01_fix-broken-smash-fail.patch
+
+
   # # terrain and overmap fixes
   echo "Applying terrain and overmap fixes"
   # Fix missing floor in the tacoma clinic:
diff --git a/sound-01_fix-broken-smash-fail.patch b/sound-01_fix-broken-smash-fail.patch
new file mode 100644
index 0000000..38a5427
--- /dev/null
+++ b/sound-01_fix-broken-smash-fail.patch
@@ -0,0 +1,28 @@
+--- a/src/map.cpp
++++ b/src/map.cpp
+@@ -3329,7 +3329,6 @@
+ bash_results map::bash_ter_furn( const tripoint &p, const bash_params &params )
+ {
+     bash_results result;
+-    std::string soundfxvariant;
+     const auto &ter_obj = ter( p ).obj();
+     const auto &furn_obj = furn( p ).obj();
+     bool smash_ter = false;
+@@ -3432,8 +3431,15 @@
+ 
+         result.did_bash = true;
+         if( !params.silent ) {
+-            sounds::sound( p, sound_volume, sounds::sound_t::combat, bash->sound_fail, false,
+-                           "smash_fail", soundfxvariant );
++            if( smash_ter == true ) {
++                std::string soundfxvariant = ter_obj.id.str();
++                sounds::sound( p, sound_volume, sounds::sound_t::combat, bash->sound_fail, false,
++                               "smash_fail", soundfxvariant );
++            } else {
++                std::string soundfxvariant = furn_obj.id.str();
++                sounds::sound( p, sound_volume, sounds::sound_t::combat, bash->sound_fail, false,
++                               "smash_fail", soundfxvariant );
++            }
+         }
+     } else {
+         if( smash_ter ) {