[Scummvm-cvs-logs] CVS: scummvm/scumm player_v2.cpp,2.18,2.19 scummvm.cpp,2.329,2.330

[Jamieson Christian]

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

Modified Files:
	player_v2.cpp scummvm.cpp 
Log Message:
Fix monkeyvga hang when using -epcspk/pcjr

Index: player_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.cpp,v
retrieving revision 2.18
retrieving revision 2.19
diff -u -d -r2.18 -r2.19
--- player_v2.cpp	12 Aug 2003 15:40:24 -0000	2.18
+++ player_v2.cpp	13 Aug 2003 17:18:31 -0000	2.19
@@ -556,6 +556,7 @@
 	channel->d.freqmod_incr = 0;
 	channel->d.freqmod_multiplier = 0;
 	channel->d.freqmod_modulo = 0;
+	channel->d.music_timer = 0;
 }
 
 int Player_V2::getMusicTimer() const {

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.329
retrieving revision 2.330
diff -u -d -r2.329 -r2.330
--- scummvm.cpp	13 Aug 2003 15:50:56 -0000	2.329
+++ scummvm.cpp	13 Aug 2003 17:18:31 -0000	2.330
@@ -1052,7 +1052,7 @@
 	} else {
 		VAR(VAR_CURRENTDRIVE) = 0;
 		VAR(VAR_FIXEDDISK) = true;
-		VAR(VAR_SOUNDCARD) = 3;
+		VAR(VAR_SOUNDCARD) = (_midiDriver == MD_PCSPK || _midiDriver == MD_PCJR) ? 0 : 3;
 		VAR(VAR_VIDEOMODE) = 0x13;
 		VAR(VAR_HEAPSPACE) = 1400;
 		VAR(VAR_MOUSEPRESENT) = true; // FIXME - used to be 0, but that seems odd?!?