diff options
| author | Jamieson Christian | 2003-08-13 17:18:31 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-08-13 17:18:31 +0000 |
| commit | 2ad09e785739f13f4d387e4a9d723b4cef07f890 (patch) | |
| tree | 3f18af8d1bfca20e18353a190c6a29b974c32098 | |
| parent | 2973317f1dca851c20be419e92dc9bdbce8ff53d (diff) | |
| download | scummvm-rg350-2ad09e785739f13f4d387e4a9d723b4cef07f890.tar.gz scummvm-rg350-2ad09e785739f13f4d387e4a9d723b4cef07f890.tar.bz2 scummvm-rg350-2ad09e785739f13f4d387e4a9d723b4cef07f890.zip | |
Fix monkeyvga hang when using -epcspk/pcjr
svn-id: r9665
| -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?!? |