diff options
author | Willem Jan Palenstijn | 2015-07-22 22:37:40 +0200 |
---|---|---|
committer | Willem Jan Palenstijn | 2015-07-22 22:43:42 +0200 |
commit | 6ec9c81b575f13b2c4b30aeac592ebf2557b5890 (patch) | |
tree | 503d50902bad2d800165593039d08d5ccf0c98ab /engines/agos/res_snd.cpp | |
parent | 5ec05f6b647c5ea41418be7ed19ad381f97cabd8 (diff) | |
parent | 4e5c8d35f7e133e2e72a846fdbd54900c91eeb73 (diff) | |
download | scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.gz scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.bz2 scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.zip |
Merge branch 'master' into mm
Conflicts:
engines/access/access.cpp
engines/access/asurface.h
engines/access/bubble_box.cpp
engines/access/bubble_box.h
engines/access/martian/martian_game.cpp
engines/access/player.cpp
engines/access/player.h
engines/access/resources.cpp
engines/access/screen.cpp
engines/access/screen.h
engines/access/sound.cpp
engines/access/sound.h
Diffstat (limited to 'engines/agos/res_snd.cpp')
-rw-r--r-- | engines/agos/res_snd.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp index 5d6ab60c8b..d04f1735d6 100644 --- a/engines/agos/res_snd.cpp +++ b/engines/agos/res_snd.cpp @@ -220,6 +220,7 @@ void AGOSEngine::playModule(uint16 music) { } _mixer->playStream(Audio::Mixer::kMusicSoundType, &_modHandle, audioStream); + _mixer->pauseHandle(_modHandle, _musicPaused); } void AGOSEngine_Simon1::playMusic(uint16 music, uint16 track) { @@ -309,7 +310,9 @@ void AGOSEngine::stopMusic() { } void AGOSEngine::playSting(uint16 soundId) { - if (!_midi->_enable_sfx) + // The sound effects in floppy disk version of + // Simon the Sorcerer 1 are only meant for AdLib + if (!_midi->_adLibMusic || !_midi->_enable_sfx) return; char filename[15]; |