aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-05-31 00:18:22 +0000
committerMax Horn2003-05-31 00:18:22 +0000
commit17a9c49dce6aee8d64b1c0ed24e4906fffa0f9fe (patch)
treefca1a791b51cd383c4a1462a1144db2d62f2fca5
parente2ffbc1f8f4e0769190f90cba5509d55192dce22 (diff)
downloadscummvm-rg350-17a9c49dce6aee8d64b1c0ed24e4906fffa0f9fe.tar.gz
scummvm-rg350-17a9c49dce6aee8d64b1c0ed24e4906fffa0f9fe.tar.bz2
scummvm-rg350-17a9c49dce6aee8d64b1c0ed24e4906fffa0f9fe.zip
fixed bug #739560: COMI: crash at start of part III
svn-id: r8162
-rw-r--r--scumm/bundle.cpp3
-rw-r--r--scumm/bundle.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/scumm/bundle.cpp b/scumm/bundle.cpp
index 8ec45d83d4..247cc99e7f 100644
--- a/scumm/bundle.cpp
+++ b/scumm/bundle.cpp
@@ -202,6 +202,7 @@ void Bundle::closeVoiceFile() {
if (_voiceFile.isOpen()) {
_voiceFile.close();
free(_bundleVoiceTable);
+ _bundleVoiceTable = NULL;
}
}
@@ -249,6 +250,8 @@ void Bundle::closeMusicFile() {
if (_musicFile.isOpen()) {
_musicFile.close();
free(_bundleMusicTable);
+ _bundleMusicTable = NULL;
+ _lastSong = -1;
}
}
diff --git a/scumm/bundle.h b/scumm/bundle.h
index e3d4eaac60..21cc4c0680 100644
--- a/scumm/bundle.h
+++ b/scumm/bundle.h
@@ -54,7 +54,6 @@ private:
File _voiceFile;
File _musicFile;
-
void initializeImcTables();
int32 compDecode(byte *src, byte *dst);