aboutsummaryrefslogtreecommitdiff
path: root/scumm/imuse_digi
diff options
context:
space:
mode:
Diffstat (limited to 'scumm/imuse_digi')
-rw-r--r--scumm/imuse_digi/dimuse_bndmgr.cpp8
-rw-r--r--scumm/imuse_digi/dimuse_bndmgr.h2
-rw-r--r--scumm/imuse_digi/dimuse_sndmgr.cpp2
3 files changed, 8 insertions, 4 deletions
diff --git a/scumm/imuse_digi/dimuse_bndmgr.cpp b/scumm/imuse_digi/dimuse_bndmgr.cpp
index 35a0414e3d..f65ec2656a 100644
--- a/scumm/imuse_digi/dimuse_bndmgr.cpp
+++ b/scumm/imuse_digi/dimuse_bndmgr.cpp
@@ -148,12 +148,16 @@ Common::File *BundleMgr::getFile(const char *filename, int32 &offset, int32 &siz
return NULL;
}
-bool BundleMgr::open(const char *filename, bool &compressed) {
+bool BundleMgr::open(const char *filename, bool &compressed, bool errorFlag) {
if (_file.isOpen())
return true;
if (g_scumm->openFile(_file, filename) == false) {
- error("BundleMgr::open() Can't open bundle file: %s", filename);
+ if (errorFlag) {
+ error("BundleMgr::open() Can't open bundle file: %s", filename);
+ } else {
+ warning("BundleMgr::open() Can't open bundle file: %s", filename);
+ }
return false;
}
diff --git a/scumm/imuse_digi/dimuse_bndmgr.h b/scumm/imuse_digi/dimuse_bndmgr.h
index a6c44a6e3e..5ddab37ec2 100644
--- a/scumm/imuse_digi/dimuse_bndmgr.h
+++ b/scumm/imuse_digi/dimuse_bndmgr.h
@@ -83,7 +83,7 @@ public:
BundleMgr(BundleDirCache *_cache);
~BundleMgr();
- bool open(const char *filename, bool &compressed);
+ bool open(const char *filename, bool &compressed, bool errorFlag=true);
void close();
Common::File *getFile(const char *filename, int32 &offset, int32 &size);
int32 decompressSampleByName(const char *name, int32 offset, int32 size, byte **comp_final, bool header_outside);
diff --git a/scumm/imuse_digi/dimuse_sndmgr.cpp b/scumm/imuse_digi/dimuse_sndmgr.cpp
index ebc0a4db1b..4c84afc108 100644
--- a/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -265,7 +265,7 @@ bool ImuseDigiSndMgr::openMusicBundle(soundStruct *sound, int disk) {
sound->bundle = new BundleMgr(_cacheBundleDir);
if (_vm->_gameId == GID_CMI) {
if (_vm->_features & GF_DEMO) {
- result = sound->bundle->open("music.bun", sound->compressed);
+ result = sound->bundle->open("music.bun", sound->compressed, false);
} else {
char musicfile[20];
if (disk == -1)