diff options
| author | Filippos Karapetis | 2009-01-04 14:38:03 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-01-04 14:38:03 +0000 |
| commit | 203358bcb70a8fe0954feccd2c7559ea7d9ade35 (patch) | |
| tree | 7964da5c3b0bb9de3edc7e3b31dd5c04c847a0a3 /engines/saga/music.cpp | |
| parent | f2b495ba2d31fc6cdfd07130c9491dea026c07cb (diff) | |
| download | scummvm-rg350-203358bcb70a8fe0954feccd2c7559ea7d9ade35.tar.gz scummvm-rg350-203358bcb70a8fe0954feccd2c7559ea7d9ade35.tar.bz2 scummvm-rg350-203358bcb70a8fe0954feccd2c7559ea7d9ade35.zip | |
Improved handling of sound resources
svn-id: r35724
Diffstat (limited to 'engines/saga/music.cpp')
| -rw-r--r-- | engines/saga/music.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp index 8ed978791f..cbe7a9113c 100644 --- a/engines/saga/music.cpp +++ b/engines/saga/music.cpp @@ -96,12 +96,7 @@ DigitalMusicInputStream::DigitalMusicInputStream(SagaEngine *vm, ResourceContext _compressedStream = NULL; - // FIXME: It is a bad idea to use the File::getName() method to distinguish - // files here (note that it is for debugging purposes only, though that was - // not correctly documented in the past). - // A better way is to keep track of this via some flag, which indicates - // whether the music file contains compressed data. - if (scumm_stricmp(_file->getName(), "music.cmp") == 0 || scumm_stricmp(_file->getName(), "musicd.cmp") == 0) { + if (context->isCompressed) { // Read compressed header to determine compression type _file->seek((long)resourceData->offset, SEEK_SET); _file->read(compressedHeader, 9); |