libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-19 00:15:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

The web version of comi demo has no music bundle.

Browse Source 
svn-id: r18479
This commit is contained in:
Travis Howell 2005-06-30 23:29:34 +00:00
parent 2e273bad42
commit a08ecca1c0
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scumm/imuse_digi/dimuse_bndmgr.cpp
View File

@ -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;
}

2
scumm/imuse_digi/dimuse_bndmgr.h
View File

@ -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);

2
scumm/imuse_digi/dimuse_sndmgr.cpp
View File

@ -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)