diff options
| author | Joost Peters | 2003-11-15 21:33:04 +0000 |
|---|---|---|
| committer | Joost Peters | 2003-11-15 21:33:04 +0000 |
| commit | f979f185af997c5f11ca57854a1874088477a898 (patch) | |
| tree | f9dba888ba28273eb77bdda8cf32bba673fe90ef /queen/sound.cpp | |
| parent | b938b63ddf4bd09db1bd1d36408a217d6d13b3f8 (diff) | |
| download | scummvm-rg350-f979f185af997c5f11ca57854a1874088477a898.tar.gz scummvm-rg350-f979f185af997c5f11ca57854a1874088477a898.tar.bz2 scummvm-rg350-f979f185af997c5f11ca57854a1874088477a898.zip | |
- Enabled missing calls to _sound->playSong, now it should *really* play all SFX
- Moved sound/music related toggle variables to Sound class
- Changed "Couldn't find file.." warning() to debug(7, ..)
svn-id: r11303
Diffstat (limited to 'queen/sound.cpp')
| -rw-r--r-- | queen/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/queen/sound.cpp b/queen/sound.cpp index 04a6cae124..b8c878c415 100644 --- a/queen/sound.cpp +++ b/queen/sound.cpp @@ -95,7 +95,7 @@ static ov_callbacks g_File_wrap = { #endif Sound::Sound(SoundMixer *mixer, Input *input, Resource *resource) : - _mixer(mixer), _input(input), _resource(resource), _lastOverride(0), _currentSong(0), _sfxHandle(0) { + _mixer(mixer), _input(input), _resource(resource), _lastOverride(0), _currentSong(0), _sfxHandle(0), _sfxToggle(true), _speechToggle(true), _musicToggle(true) { } Sound::~Sound() { @@ -137,7 +137,7 @@ void Sound::waitSfxFinished() { void Sound::playSong(int16 songNum) { int16 newTune = _song[songNum - 1].tuneList[0]; - if (_tune[newTune - 1].sfx[0] /* && _sfxToggle */ ) + if (_tune[newTune - 1].sfx[0] && sfxOn()) sfxPlay(_sfxName[_tune[newTune - 1].sfx[0] - 1]); } |