[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_bndmgr.h,1.18,1.19 dimuse_sndmgr.cpp,1.75,1.76

kirben kirben at users.sourceforge.net
Thu Sep 1 18:43:57 CEST 2005


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

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

Match original games, only the music file is essential in COMI.


Index: dimuse_bndmgr.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_bndmgr.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- dimuse_bndmgr.h	30 Jul 2005 21:11:32 -0000	1.18
+++ dimuse_bndmgr.h	2 Sep 2005 01:41:52 -0000	1.19
@@ -83,7 +83,7 @@
 	BundleMgr(BundleDirCache *_cache);
 	~BundleMgr();
 
-	bool open(const char *filename, bool &compressed, bool errorFlag=true);
+	bool open(const char *filename, bool &compressed, bool errorFlag=false);
 	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.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- dimuse_sndmgr.cpp	10 Aug 2005 12:42:56 -0000	1.75
+++ dimuse_sndmgr.cpp	2 Sep 2005 01:41:53 -0000	1.76
@@ -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, false);
+			result = sound->bundle->open("music.bun", sound->compressed);
 		} else {
 			char musicfile[20];
 			if (disk == -1)
@@ -278,13 +278,13 @@
 //				sound->bundle->closeFile();
 //			}
 
-			result = sound->bundle->open(musicfile, sound->compressed);
+			result = sound->bundle->open(musicfile, sound->compressed, true);
 
 			// FIXME: Shouldn't we only set _disk if result == true?
 			_disk = (byte)_vm->VAR(_vm->VAR_CURRENTDISK);
 		}
 	} else if (_vm->_gameId == GID_DIG)
-		result = sound->bundle->open("digmusic.bun", sound->compressed);
+		result = sound->bundle->open("digmusic.bun", sound->compressed, true);
 	else
 		error("ImuseDigiSndMgr::openMusicBundle() Don't know which bundle file to load");
 





More information about the Scummvm-git-logs mailing list