dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Skip sound effects handling earlier if effects volume is 0

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-08-23 20:36:22 +01:00
parent 4fd8634ff9
commit 0bec49fa56
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sound.cpp
View File

@@ -256,8 +256,6 @@ void SndCopyToPool()
*/
static void SndPlayScreenCoordFx(SoundID sound, int left, int right, int top, int bottom)
{
if (_settings_client.music.effect_vol == 0) return;
for (const Window *w : Window::IterateFromBack()) {
const Viewport *vp = w->viewport;
@@ -280,6 +278,8 @@ static void SndPlayScreenCoordFx(SoundID sound, int left, int right, int top, in
void SndPlayTileFx(SoundID sound, TileIndex tile)
{
if (_settings_client.music.effect_vol == 0) return;
/* emits sound from center of the tile */
int x = std::min(MapMaxX() - 1, TileX(tile)) * TILE_SIZE + TILE_SIZE / 2;
int y = std::min(MapMaxY() - 1, TileY(tile)) * TILE_SIZE - TILE_SIZE / 2;
@@ -292,6 +292,8 @@ void SndPlayTileFx(SoundID sound, TileIndex tile)
void SndPlayVehicleFx(SoundID sound, const Vehicle *v)
{
if (_settings_client.music.effect_vol == 0) return;
SndPlayScreenCoordFx(sound,
v->coord.left, v->coord.right,
v->coord.top, v->coord.bottom