diff options
| author | Jamieson Christian | 2003-08-16 07:19:28 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-08-16 07:19:28 +0000 |
| commit | 78fba0a8536711a580e14539fee46888d4a5d22f (patch) | |
| tree | 1048119fa2b5eca91852a5b1a89e0382fb35906d | |
| parent | 4da3bf3a61eec24faa48f3cc7fd6defabfe040d2 (diff) | |
| download | scummvm-rg350-78fba0a8536711a580e14539fee46888d4a5d22f.tar.gz scummvm-rg350-78fba0a8536711a580e14539fee46888d4a5d22f.tar.bz2 scummvm-rg350-78fba0a8536711a580e14539fee46888d4a5d22f.zip | |
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.
svn-id: r9716
| -rw-r--r-- | scumm/scummvm.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 10122dd689..fa54149f43 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1053,9 +1053,10 @@ void Scumm::initScummVars() { 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; |