[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_bndmgr.cpp,1.35,1.36 dimuse_bndmgr.h,1.16,1.17 dimuse_sndmgr.cpp,1.71,1.72

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1858/scumm/imuse_digi

Modified Files:
	dimuse_bndmgr.cpp dimuse_bndmgr.h dimuse_sndmgr.cpp 
Log Message:

The web version of comi demo has no music bundle.


Index: dimuse_bndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_bndmgr.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- dimuse_bndmgr.cpp	24 Jun 2005 15:23:20 -0000	1.35
+++ dimuse_bndmgr.cpp	30 Jun 2005 23:29:34 -0000	1.36
@@ -148,12 +148,16 @@
 	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;
 	}
 

Index: dimuse_bndmgr.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_bndmgr.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- dimuse_bndmgr.h	23 May 2005 23:59:20 -0000	1.16
+++ dimuse_bndmgr.h	30 Jun 2005 23:29:34 -0000	1.17
@@ -83,7 +83,7 @@
 	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);

Index: dimuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- dimuse_sndmgr.cpp	24 Jun 2005 15:23:21 -0000	1.71
+++ dimuse_sndmgr.cpp	30 Jun 2005 23:29:34 -0000	1.72
@@ -265,7 +265,7 @@
 	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)