Fix monkeyvga hang when using -epcspk/pcjr

svn-id: r9665
This commit is contained in:
Jamieson Christian 2003-08-13 17:18:31 +00:00
parent 2973317f1d
commit 2ad09e7857
2 changed files with 2 additions and 1 deletions

View File

@ -556,6 +556,7 @@ void Player_V2::clear_channel(int i) {
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 {

View File

@ -1052,7 +1052,7 @@ void Scumm::initScummVars() {
} 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?!?