[Scummvm-cvs-logs] CVS: scummvm/scumm bundle.cpp,1.40,1.41 bundle.h,1.18,1.19

Max Horn fingolfin at users.sourceforge.net
Fri May 30 17:19:02 CEST 2003


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

Modified Files:
	bundle.cpp bundle.h 
Log Message:
fixed bug #739560: COMI: crash at start of part III

Index: bundle.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bundle.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- bundle.cpp	28 May 2003 02:08:30 -0000	1.40
+++ bundle.cpp	31 May 2003 00:18:22 -0000	1.41
@@ -202,6 +202,7 @@
 	if (_voiceFile.isOpen()) {
 		_voiceFile.close();
 		free(_bundleVoiceTable);
+		_bundleVoiceTable = NULL;
 	}
 }
 
@@ -249,6 +250,8 @@
 	if (_musicFile.isOpen()) {
 		_musicFile.close();
 		free(_bundleMusicTable);
+		_bundleMusicTable = NULL;
+		_lastSong = -1;
 	}
 }
 

Index: bundle.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bundle.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- bundle.h	31 May 2003 00:02:59 -0000	1.18
+++ bundle.h	31 May 2003 00:18:22 -0000	1.19
@@ -54,7 +54,6 @@
 	File _voiceFile;
 	File _musicFile;
 
-
 	void initializeImcTables();
 
 	int32 compDecode(byte *src, byte *dst);





More information about the Scummvm-git-logs mailing list