diff options
| author | rubidium <rubidium@openttd.org> | 2011-03-05 18:00:48 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-03-05 18:00:48 +0000 |
| commit | f90044d343ff97ca54c09e9f5360eba87744b613 (patch) | |
| tree | 86c4c198468833f166103cb5011f15c3e60d4641 /src/sound.cpp | |
| parent | baaf3cd837fb9af8b47fb91e093150b9058b6740 (diff) | |
| download | openttd-f90044d343ff97ca54c09e9f5360eba87744b613.tar.xz | |
(svn r22202) -Codechange: make MusicFileSettings a proper citizen of the client settings
Diffstat (limited to 'src/sound.cpp')
| -rw-r--r-- | src/sound.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/sound.cpp b/src/sound.cpp index 060eb6073..4b6886d36 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -22,7 +22,6 @@ #include "base_media_func.h" static SoundEntry _original_sounds[ORIGINAL_SAMPLE_COUNT]; -MusicFileSettings _msf; static void OpenBankFile(const char *filename) { @@ -227,7 +226,7 @@ void SndCopyToPool() */ static void SndPlayScreenCoordFx(SoundID sound, int left, int right, int top, int bottom) { - if (_msf.effect_vol == 0) return; + if (_settings_client.music.effect_vol == 0) return; const Window *w; FOR_ALL_WINDOWS_FROM_BACK(w) { @@ -243,7 +242,7 @@ static void SndPlayScreenCoordFx(SoundID sound, int left, int right, int top, in StartSound( sound, panning, - (_msf.effect_vol * _vol_factor_by_zoom[vp->zoom - ZOOM_LVL_BEGIN]) / 256 + (_settings_client.music.effect_vol * _vol_factor_by_zoom[vp->zoom - ZOOM_LVL_BEGIN]) / 256 ); return; } @@ -272,7 +271,7 @@ void SndPlayVehicleFx(SoundID sound, const Vehicle *v) void SndPlayFx(SoundID sound) { - StartSound(sound, 0.5, _msf.effect_vol); + StartSound(sound, 0.5, _settings_client.music.effect_vol); } INSTANTIATE_BASE_MEDIA_METHODS(BaseMedia<SoundsSet>, SoundsSet) |