diff options
author | Paweł Kołodziejski | 2002-08-08 06:45:55 +0000 |
---|---|---|
committer | Paweł Kołodziejski | 2002-08-08 06:45:55 +0000 |
commit | 5a685f56581ff0a34d6309e920a82f62e0e31f83 (patch) | |
tree | 2cf5f4e45776cdf036ef9fd5c805a4030f99b11c | |
parent | 7de22821085b7e950d237c60ba3176705e3c128f (diff) | |
download | scummvm-rg350-5a685f56581ff0a34d6309e920a82f62e0e31f83.tar.gz scummvm-rg350-5a685f56581ff0a34d6309e920a82f62e0e31f83.tar.bz2 scummvm-rg350-5a685f56581ff0a34d6309e920a82f62e0e31f83.zip |
DIG: stop play music, when SMUSH is playing
svn-id: r4715
-rw-r--r-- | insane.cpp | 1 | ||||
-rw-r--r-- | sound.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/insane.cpp b/insane.cpp index e534071102..c2379c0bb2 100644 --- a/insane.cpp +++ b/insane.cpp @@ -1511,6 +1511,7 @@ void SmushPlayer::startVideo(short int arg, byte *videoFile) pcd37.table_last_pitch = 0; pcd37.table_last_flags = 0; + sm->stopBundleMusic(); init(); openFile(videoFile); @@ -811,6 +811,7 @@ void Scumm::playBundleMusic(int32 song) { } void Scumm::stopBundleMusic() { + _timer->releaseProcedure(&music_handler); _numberBundleMusic = -1; if (_musicBundleBufFinal) free(_musicBundleBufFinal); |