diff options
| author | Jamieson Christian | 2003-09-30 16:45:50 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-09-30 16:45:50 +0000 |
| commit | 4ab0dff9ebb917cb1350824220d41d4a86cd70d1 (patch) | |
| tree | 6c4c5ae9bb3a4dfe19ea2524034c3dbec0d4e390 /scumm | |
| parent | 43fb8e6c6fe22c910e7a16448ca4df0d04b663e8 (diff) | |
| download | scummvm-rg350-4ab0dff9ebb917cb1350824220d41d4a86cd70d1.tar.gz scummvm-rg350-4ab0dff9ebb917cb1350824220d41d4a86cd70d1.tar.bz2 scummvm-rg350-4ab0dff9ebb917cb1350824220d41d4a86cd70d1.zip | |
This may be an issue in legit gameplay, but GF_FMTOWNS
games do use _musicEngine for the FM synth stuff, so
don't exclude it in stopSound(). (Is this assumption
made elsewhere also?)
svn-id: r10506
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/sound.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 7a7a7ff89e..a311dd261a 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -702,11 +702,10 @@ void Sound::stopSound(int a) { stopCDTimer(); } - if (_scumm->_features & GF_FMTOWNS) { + if (_scumm->_features & GF_FMTOWNS) _scumm->_mixer->stopID(a); - } else if (_scumm->_musicEngine) { + if (_scumm->_musicEngine) _scumm->_musicEngine->stopSound(a); - } for (i = 0; i < 10; i++) if (_soundQue2[i] == a) |