diff options
| author | rubidium <rubidium@openttd.org> | 2011-01-02 18:12:39 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-01-02 18:12:39 +0000 |
| commit | ad15cd37a601de4bf2446e9e4538cda3c140b4ef (patch) | |
| tree | 5057718dee0b78af4309085254a6faa411980e3c /src/sound.cpp | |
| parent | 4ec6c19d449ea010432bb4972910bffc6ed2c548 (diff) | |
| download | openttd-ad15cd37a601de4bf2446e9e4538cda3c140b4ef.tar.xz | |
(svn r21698) -Fix: incorrectly named global variable
Diffstat (limited to 'src/sound.cpp')
| -rw-r--r-- | src/sound.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sound.cpp b/src/sound.cpp index d54464cd4..060eb6073 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -22,7 +22,7 @@ #include "base_media_func.h" static SoundEntry _original_sounds[ORIGINAL_SAMPLE_COUNT]; -MusicFileSettings msf; +MusicFileSettings _msf; static void OpenBankFile(const char *filename) { @@ -227,7 +227,7 @@ void SndCopyToPool() */ static void SndPlayScreenCoordFx(SoundID sound, int left, int right, int top, int bottom) { - if (msf.effect_vol == 0) return; + if (_msf.effect_vol == 0) return; const Window *w; FOR_ALL_WINDOWS_FROM_BACK(w) { @@ -243,7 +243,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 + (_msf.effect_vol * _vol_factor_by_zoom[vp->zoom - ZOOM_LVL_BEGIN]) / 256 ); return; } @@ -272,7 +272,7 @@ void SndPlayVehicleFx(SoundID sound, const Vehicle *v) void SndPlayFx(SoundID sound) { - StartSound(sound, 0.5, msf.effect_vol); + StartSound(sound, 0.5, _msf.effect_vol); } INSTANTIATE_BASE_MEDIA_METHODS(BaseMedia<SoundsSet>, SoundsSet) |