diff options
| author | Jamieson Christian | 2003-10-02 14:37:40 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-10-02 14:37:40 +0000 |
| commit | db798a3e7dbb4df5cf7f53a66188a8fcececa1ae (patch) | |
| tree | de0820d6f94daeb4e4e41d5cbc518feecaaf3b4c /scumm | |
| parent | 27db410dfaf2daa7b885be9e59519e97c0f6e101 (diff) | |
| download | scummvm-rg350-db798a3e7dbb4df5cf7f53a66188a8fcececa1ae.tar.gz scummvm-rg350-db798a3e7dbb4df5cf7f53a66188a8fcececa1ae.tar.bz2 scummvm-rg350-db798a3e7dbb4df5cf7f53a66188a8fcececa1ae.zip | |
Fix for Bug [815851] DOTT: MT-32 MIDI priority
Favor 'ROL ' resources over 'GMD ' if
--native-mt32 is selected.
svn-id: r10537
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/resource.cpp | 2 | ||||
| -rw-r--r-- | scumm/scumm.h | 1 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index b25ecbf541..ca7155ad7b 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -747,6 +747,8 @@ int Scumm::readSoundResource(int type, int idx) { break; case MKID('ROL '): pri = 3; + if (_native_mt32) + pri = 5; break; case MKID('GMD '): pri = 4; diff --git a/scumm/scumm.h b/scumm/scumm.h index 39932839e2..fbc2346c94 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -971,6 +971,7 @@ protected: uint16 _defaultTalkDelay; int tempMusic; int _saveSound; + bool _native_mt32; public: bool _silentDigitalImuse, _noDigitalSamples; diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index a926892957..e87fc556b5 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -663,6 +663,7 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) _confirmExit = detector->_confirmExit; _defaultTalkDelay = detector->_talkSpeed; _midiDriver = detector->_midi_driver; + _native_mt32 = detector->_native_mt32; _language = detector->_language; memset(&res, 0, sizeof(res)); _hexdumpScripts = false; |