[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.131,1.132

[Jamieson Christian]

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

Modified Files:
	resource.cpp 
Log Message:
Fixed problem with Adlib sounds being generated
when using -epcspk or -epcjr with V6 games that
don't have PC speaker resources.

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- resource.cpp	15 Aug 2003 05:35:12 -0000	1.131
+++ resource.cpp	15 Aug 2003 07:45:21 -0000	1.132
@@ -710,9 +710,11 @@
 				(char)((basetag >> 8) & 0xff), (char)(basetag & 0xff), total_size);
 
 	if (basetag == MKID('MIDI') || basetag == MKID('iMUS')) {
-		_fileHandle.seek(-8, SEEK_CUR);
-		_fileHandle.read(createResource(type, idx, total_size + 8), total_size + 8);
-		return 1;
+		if (_midiDriver != MD_PCSPK && _midiDriver != MD_PCJR) {
+			_fileHandle.seek(-8, SEEK_CUR);
+			_fileHandle.read(createResource(type, idx, total_size + 8), total_size + 8);
+			return 1;
+		}
 	} else if (basetag == MKID('SOU ')) {
 		best_pri = -1;
 		while (pos < total_size) {