[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.338,2.339

[Jamieson Christian]

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

Modified Files:
	scummvm.cpp 
Log Message:
Changed VAR_SOUNDCARD to 0 for MD_NULL MidiDriver,
and 1 for PC speaker and PCjr. This fixes a hang
in LoomCD if the default MidiDriver happens to be
a native driver. (For some reason the CD version
still has script variations based on whether a
Roland soundcard was selected. WTH?) LoomCD now
always reverts to MD_NULL, so VAR_SOUNDCARD will
always be set appropriately.

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.338
retrieving revision 2.339
diff -u -d -r2.338 -r2.339
--- scummvm.cpp	15 Aug 2003 15:10:19 -0000	2.338
+++ scummvm.cpp	16 Aug 2003 07:19:28 -0000	2.339
@@ -1053,9 +1053,10 @@
 		VAR(VAR_CURRENTDRIVE) = 0;
 		VAR(VAR_FIXEDDISK) = true;
 		switch (_midiDriver) {
+		case MD_NULL:  VAR(VAR_SOUNDCARD) = 0; break;
 		case MD_ADLIB: VAR(VAR_SOUNDCARD) = 3; break;
 		case MD_PCSPK:
-		case MD_PCJR:  VAR(VAR_SOUNDCARD) = 0; break;
+		case MD_PCJR:  VAR(VAR_SOUNDCARD) = 1; break;
 		default:       
 			if (_features & GF_SMALL_HEADER)
 				VAR(VAR_SOUNDCARD) = 4;