diff options
| author | James Brown | 2002-09-29 11:11:42 +0000 |
|---|---|---|
| committer | James Brown | 2002-09-29 11:11:42 +0000 |
| commit | dfdb1f7547d30d98936bbc88a5174ebcfd5808ed (patch) | |
| tree | 6224e1664e9ee6560f9bf6b8f23f75197a995902 /scumm/resource.cpp | |
| parent | 588815a11e99ac941304dad07e686a78e214d2f7 (diff) | |
| download | scummvm-rg350-dfdb1f7547d30d98936bbc88a5174ebcfd5808ed.tar.gz scummvm-rg350-dfdb1f7547d30d98936bbc88a5174ebcfd5808ed.tar.bz2 scummvm-rg350-dfdb1f7547d30d98936bbc88a5174ebcfd5808ed.zip | |
Merge in 615745: GMD via AdLib emulation
Remove MIDIEMU driver obsoleted by patch.
Change functionality to fallback to AdLib/AdLibGMD Emulation where MIDI init fails
Switch to NewGUI by default (old code retained 'Just in case')
svn-id: r5033
Diffstat (limited to 'scumm/resource.cpp')
| -rw-r--r-- | scumm/resource.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 4e3ba95b26..c33ceb53c4 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -613,7 +613,7 @@ int Scumm::readSoundResource(int type, int idx) pri = 2; break; case MKID('GMD '): - if (!_use_adlib) +// if (!_use_adlib) pri = 3; break; case MKID('MAC '): |