--- a/src/map.cpp +++ b/src/map.cpp @@ -3329,7 +3329,6 @@ bash_results map::bash_ter_furn( const tripoint &p, const bash_params ¶ms ) { 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 ) {