From f95ea3afdf392ca3bd39f8be8560cefd1b25cef3 Mon Sep 17 00:00:00 2001 From: Jamieson Christian Date: Wed, 18 Dec 2002 14:57:25 +0000 Subject: 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 --- scumm/imuse.cpp | 1 + scumm/resource.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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; -- cgit v1.2.3