From 4ab0dff9ebb917cb1350824220d41d4a86cd70d1 Mon Sep 17 00:00:00 2001 From: Jamieson Christian Date: Tue, 30 Sep 2003 16:45:50 +0000 Subject: 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 --- scumm/sound.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'scumm') 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) -- cgit v1.2.3