diff --git a/src/map.cpp b/src/map.cpp index 466e83928beb2..f6c16e2b210dd 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -3174,9 +3174,9 @@ void map::bash_ter_furn( const tripoint &p, bash_params ¶ms ) sound_volume = sound_fail_vol; } - sound = bash->sound_fail.empty() ? _( "Thnk!" ) : _( bash->sound_fail ); params.did_bash = true; if( !params.silent ) { + sound = bash->sound_fail.empty() ? _( "Thnk!" ) : _( bash->sound_fail ); sounds::sound( p, sound_volume, sounds::sound_t::combat, sound, false, "smash_fail", soundfxvariant ); } @@ -3205,7 +3205,7 @@ void map::bash_ter_furn( const tripoint &p, bash_params ¶ms ) } soundfxid = "smash_success"; - sound = _( bash->sound ); + sound = bash->sound; // Set this now in case the ter_set below changes this const bool collapses = smash_ter && has_flag( "COLLAPSES", p ); const bool supports = smash_ter && has_flag( "SUPPORTS_ROOF", p ); @@ -3337,7 +3337,7 @@ void map::bash_ter_furn( const tripoint &p, bash_params ¶ms ) params.success |= success; // Not always true, so that we can tell when to stop destroying params.bashed_solid = true; if( !sound.empty() && !params.silent ) { - sounds::sound( p, sound_volume, sounds::sound_t::combat, sound, false, + sounds::sound( p, sound_volume, sounds::sound_t::combat, _( sound ), false, soundfxid, soundfxvariant ); } }