diff options
| author | Johannes Schickel | 2006-06-02 22:57:02 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2006-06-02 22:57:02 +0000 |
| commit | 6ac60c9c7bc39f4e1d9f950d67b4e484220ebc9d (patch) | |
| tree | 40e2845a46ae598892a9e87235533ba06298f2dd /engines/kyra/sound.cpp | |
| parent | 50f12fb9aaba758d97a928bfa0ab197016b40cfe (diff) | |
| download | scummvm-rg350-6ac60c9c7bc39f4e1d9f950d67b4e484220ebc9d.tar.gz scummvm-rg350-6ac60c9c7bc39f4e1d9f950d67b4e484220ebc9d.tar.bz2 scummvm-rg350-6ac60c9c7bc39f4e1d9f950d67b4e484220ebc9d.zip | |
Fix for bug # 1497961 ("KYRA1: in-game "Music" option not working").
svn-id: r22844
Diffstat (limited to 'engines/kyra/sound.cpp')
| -rw-r--r-- | engines/kyra/sound.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 02208f9f5d..a96c46604b 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -36,7 +36,8 @@ namespace Kyra { Sound::Sound(KyraEngine *engine, Audio::Mixer *mixer) - : _engine(engine), _mixer(mixer), _currentVocFile(0), _vocHandle(), _compressHandle() { + : _engine(engine), _mixer(mixer), _currentVocFile(0), _vocHandle(), _compressHandle(), + _musicEnabled(true), _sfxEnabled(false) { } Sound::~Sound() { @@ -363,7 +364,7 @@ void SoundMidiPC::onTimer(void *refCon) { } void SoundMidiPC::playTrack(uint8 track) { - if (_parser && (track != 0 || _nativeMT32)) { + if (_parser && (track != 0 || _nativeMT32) && _musicEnabled) { _isPlaying = true; _fadeMusicOut = false; _fadeStartTime = 0; @@ -387,7 +388,7 @@ void SoundMidiPC::haltTrack() { } void SoundMidiPC::playSoundEffect(uint8 track) { - if (_soundEffect) { + if (_soundEffect && _sfxEnabled) { _sfxIsPlaying = true; _soundEffect->setTrack(track); _soundEffect->jumpToTick(0); |