[Scummvm-cvs-logs] CVS: scummvm/scumm bundle.cpp,1.16,1.17 bundle.h,1.7,1.8

Pawel Kolodziejski aquadran at users.sourceforge.net
Tue Jan 14 09:48:06 CET 2003


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

Modified Files:
	bundle.cpp bundle.h 
Log Message:
increased compression table for comi music, and added assert for it

Index: bundle.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bundle.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- bundle.cpp	29 Dec 2002 12:44:57 -0000	1.16
+++ bundle.cpp	14 Jan 2003 17:47:33 -0000	1.17
@@ -271,6 +271,7 @@
 
 	comp_output = (byte *)malloc(10000);
 
+	assert(num <= 50);
 	for (i = 0; i < num; i++) {
 		comp_input = (byte *)malloc(_compVoiceTable[i].size);
 
@@ -313,6 +314,7 @@
 			return 0;
 		}
 
+		assert(num <= 3361);
 		for (i = 0; i < num; i++) {
 			_compMusicTable[i].offset = _musicFile.readUint32BE();
 			_compMusicTable[i].size = _musicFile.readUint32BE();

Index: bundle.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bundle.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- bundle.h	12 Jan 2003 19:15:28 -0000	1.7
+++ bundle.h	14 Jan 2003 17:47:33 -0000	1.8
@@ -43,8 +43,9 @@
 	int32 compDecode(byte *src, byte *dst);
 	int32 decompressCodec(int32 codec, byte *comp_input, byte *comp_output, int32 size, int32 index, int32 & channels);
 	CompTable _compVoiceTable[50];
-	CompTable _compMusicTable[2500];
+	CompTable _compMusicTable[3361];
 	File _voiceFile;
+	File _musicFile;
 	BundleAudioTable *_bundleVoiceTable;
 	BundleAudioTable *_bundleMusicTable;
 	int32 _numVoiceFiles;
@@ -59,7 +60,6 @@
 	  Bundle();
 	 ~Bundle();
 
-	File _musicFile;
 	void initializeImcTables();
 	bool openVoiceFile(const char *filename, const char *directory);
 	bool openMusicFile(const char *filename, const char *directory);





More information about the Scummvm-git-logs mailing list