diff options
| -rw-r--r-- | scumm/player_v2.cpp | 1 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scumm/player_v2.cpp b/scumm/player_v2.cpp index c2e97a7e87..b3271b2922 100644 --- a/scumm/player_v2.cpp +++ b/scumm/player_v2.cpp @@ -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 { diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 6493f9db25..a87dc31017 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -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?!? |