aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2006-02-16 05:55:44 +0000
committerTravis Howell2006-02-16 05:55:44 +0000
commit5f72260f201a6b63223a3cefb2829f91a9c11324 (patch)
tree2eb99fee16e52a3740bfdc55e05131bb2a9a03f4
parente77fc9b9aa245fd0ff1ea19cd0bb510958aa93b6 (diff)
downloadscummvm-rg350-5f72260f201a6b63223a3cefb2829f91a9c11324.tar.gz
scummvm-rg350-5f72260f201a6b63223a3cefb2829f91a9c11324.tar.bz2
scummvm-rg350-5f72260f201a6b63223a3cefb2829f91a9c11324.zip
Stop current music in HE60/61 games, before starting new music
svn-id: r20719
-rw-r--r--engines/scumm/he/sound_he.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index 65a67216df..36155f8a41 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -499,8 +499,10 @@ void Sound::playHESound(int soundID, int heOffset, int heChannel, int heFlags) {
_vm->_mixer->playRaw(NULL, sound, size, rate, flags, soundID);
}
else if (READ_UINT32(ptr) == MKID('MIDI')) {
- if (_vm->_musicEngine) {
- _vm->_musicEngine->startSound(soundID);
+ if (_vm->_imuse) {
+ _vm->_imuse->stopSound(_currentMusic);
+ _currentMusic = soundID;
+ _vm->_imuse->startSound(soundID);
}
}
}