aboutsummaryrefslogtreecommitdiff
path: root/scumm/smush
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-06-11 15:46:00 +0000
committerTorbjörn Andersson2005-06-11 15:46:00 +0000
commitcf80e36831c4c09961e5153d9edcdf8083d2ae4e (patch)
tree867a7abbddf9a0c78f04a5aa3d303597905dbc3a /scumm/smush
parenta2c90de0dbfcf5d859fb3790780e220dbf029be0 (diff)
downloadscummvm-rg350-cf80e36831c4c09961e5153d9edcdf8083d2ae4e.tar.gz
scummvm-rg350-cf80e36831c4c09961e5153d9edcdf8083d2ae4e.tar.bz2
scummvm-rg350-cf80e36831c4c09961e5153d9edcdf8083d2ae4e.zip
This should fix playing the sound for the entering/exiting the old mine
road movies when using compressed SAN files. (The movies are started through seekSan() rather than play().) svn-id: r18376
Diffstat (limited to 'scumm/smush')
-rw-r--r--scumm/smush/smush_player.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index 376ac78b46..e55aa258f1 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -1173,6 +1173,10 @@ void SmushPlayer::seekSan(const char *file, int32 pos, int32 contFrame) {
_middleAudio = true;
pos -= 8;
+ } else {
+ // We need this in Full Throttle when entering/leaving
+ // the old mine road.
+ tryCmpFile(file);
}
_skipPalette = false;
} else {
@@ -1185,6 +1189,10 @@ void SmushPlayer::seekSan(const char *file, int32 pos, int32 contFrame) {
}
void SmushPlayer::tryCmpFile(const char *filename) {
+ if (_compressedFile.isOpen()) {
+ _vm->_mixer->stopHandle(_compressedFileSoundHandle);
+ _compressedFile.close();
+ }
_compressedFileMode = false;
const char *i = strrchr(filename, '.');
if (i == NULL) {