[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.23,1.24

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv4853

Modified Files:
	imuse_digi.cpp 
Log Message:
updated imuse digital tables

Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- imuse_digi.cpp	22 Jun 2003 11:47:03 -0000	1.23
+++ imuse_digi.cpp	22 Jun 2003 17:49:38 -0000	1.24
@@ -33,87 +33,16 @@
 //
 ////////////////////////////////////////
 
-static byte *readCreativeVocFile(byte *ptr, uint32 &size, uint32 &rate, uint32 &loops) {
-	assert(strncmp((char *)ptr, "Creative Voice File\x1A", 20) == 0);
-	int32 offset = READ_LE_UINT16(ptr + 20);
-	int16 version = READ_LE_UINT16(ptr + 22);
-	int16 code = READ_LE_UINT16(ptr + 24);
-	assert(version == 0x010A || version == 0x0114);
-	assert(code == ~version + 0x1234);
-	bool quit = 0;
[...974 lines suppressed...]
 						return 1;
 					}
-					if ((_digSeqMusicTable[l].index == b)) {
+					if ((_digSeqMusicTable[l].room == b)) {
 						debug(5, "Play imuse music: %s, %s, %s", _digSeqMusicTable[l].name, _digSeqMusicTable[l].title, _digSeqMusicTable[l].filename);
 						if (_digSeqMusicTable[l].filename[0] != 0) {
 							_scumm->_sound->playBundleMusic((const char *)_digSeqMusicTable[l].filename);
@@ -1188,10 +1196,10 @@
 				}
 			} else if (_scumm->_gameId == GID_CMI) {
 				for (l = 0;; l++) {
-					if (_comiSeqMusicTable[l].index == -1) {
+					if (_comiSeqMusicTable[l].id == -1) {
 						return 1;
 					}
-					if ((_comiSeqMusicTable[l].index == b)) {
+					if ((_comiSeqMusicTable[l].id == b)) {
 						debug(5, "Play imuse music: %s, %s, %s", _comiSeqMusicTable[l].name, _comiSeqMusicTable[l].title, _comiSeqMusicTable[l].filename);
 						if (_comiSeqMusicTable[l].filename[0] != 0) {
 							_scumm->_sound->playBundleMusic((const char *)_comiSeqMusicTable[l].filename);