aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2007-07-17 18:04:30 +0000
committerFilippos Karapetis2007-07-17 18:04:30 +0000
commit5b7df04da9001d79c4cf5704b5d86de130e481f0 (patch)
tree9b0d985d736155b906388e8359ac08ba7a24dbfc
parent91426f82c6f4e3edc8217e8c5122847f583095fa (diff)
downloadscummvm-rg350-5b7df04da9001d79c4cf5704b5d86de130e481f0.tar.gz
scummvm-rg350-5b7df04da9001d79c4cf5704b5d86de130e481f0.tar.bz2
scummvm-rg350-5b7df04da9001d79c4cf5704b5d86de130e481f0.zip
Possible fix for bug 1754613. It's now possible to have an uncompressed music.rsc file when the rest of the data files are compressed
svn-id: r28126
-rw-r--r--engines/saga/rscfile.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/saga/rscfile.cpp b/engines/saga/rscfile.cpp
index 59dc42225c..39224b032b 100644
--- a/engines/saga/rscfile.cpp
+++ b/engines/saga/rscfile.cpp
@@ -427,14 +427,14 @@ bool Resource::createContexts() {
if (Common::File::exists("music.rsc") || Common::File::exists("music.cmp")) {
_contextsCount++;
digitalMusic = true;
- if (_vm->getFeatures() & GF_COMPRESSED_SOUNDS)
+ if (Common::File::exists("music.cmp"))
sprintf(musicFileName, "music.cmp");
else
sprintf(musicFileName, "music.rsc");
} else if (Common::File::exists("musicd.rsc") || Common::File::exists("musicd.cmp")) {
_contextsCount++;
digitalMusic = true;
- if (_vm->getFeatures() & GF_COMPRESSED_SOUNDS)
+ if (Common::File::exists("musicd.rsc"))
sprintf(musicFileName, "musicd.cmp");
else
sprintf(musicFileName, "musicd.rsc");