Updated to 2022-07-06-2051.

Remove gcc11 hack as the unloading liquids crash has been fixed upstream.
Remove smash_fail patch as it has been fixed upstream.

1 files changed, 0 insertions, 28 deletions

diff --git a/sound-01_fix-broken-smash-fail.patch b/sound-01_fix-broken-smash-fail.patch
deleted file mode 100644
index 38a5427..0000000
--- a/sound-01_fix-broken-smash-fail.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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 ) {