diff options
| author | Jamieson Christian | 2002-12-18 14:57:25 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2002-12-18 14:57:25 +0000 |
| commit | f95ea3afdf392ca3bd39f8be8560cefd1b25cef3 (patch) | |
| tree | 22983491b81ef892d85edd75535f6997395c6b89 | |
| parent | d622df84d10b3ccf6950ab9f5acbdb85fa6ff2f1 (diff) | |
| download | scummvm-rg350-f95ea3afdf392ca3bd39f8be8560cefd1b25cef3.tar.gz scummvm-rg350-f95ea3afdf392ca3bd39f8be8560cefd1b25cef3.tar.bz2 scummvm-rg350-f95ea3afdf392ca3bd39f8be8560cefd1b25cef3.zip | |
Fixed problems with instruments after load.
Ignore Adlib-only music when running native MIDI.
(Can't remember why I included them in the first place,
so until I do remember, it's coming back out.)
svn-id: r6020
| -rw-r--r-- | scumm/imuse.cpp | 1 | ||||
| -rw-r--r-- | scumm/resource.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp index f387bf3a9f..050a725124 100644 --- a/scumm/imuse.cpp +++ b/scumm/imuse.cpp @@ -3242,6 +3242,7 @@ void Part::fix_after_load() set_detune(_detune); set_pri(_pri); set_pan(_pan); + if (_program < 128) _instrument.program (_program, _player->_mt32emulate); changed (IMuseDriver::pcAll); } diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 7129547c98..34524a5128 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -608,7 +608,7 @@ int Scumm::readSoundResource(int type, int idx) pri = 15; break; case MKID('ADL '): - pri = 1; +// pri = 1; if (_use_adlib) pri = 10; break; |