diff options
| author | Filippos Karapetis | 2015-12-28 02:38:52 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2015-12-28 02:38:52 +0200 |
| commit | d119d3eba47f55e13c6333ff748c7788257b4fb8 (patch) | |
| tree | df12f0eeb7ca33dd490fdf4d8bddbd5c9f3e6121 /audio/softsynth | |
| parent | 908d2f39d7579c3f1781f7dedc7b26366a6d3dfc (diff) | |
| download | scummvm-rg350-d119d3eba47f55e13c6333ff748c7788257b4fb8.tar.gz scummvm-rg350-d119d3eba47f55e13c6333ff748c7788257b4fb8.tar.bz2 scummvm-rg350-d119d3eba47f55e13c6333ff748c7788257b4fb8.zip | |
MT32: Check for CM32-L ROMs before checking for MT-32 ones
This ensures that the CM32-L ROMs will be preferred, if both sets are
located in the same folder
Diffstat (limited to 'audio/softsynth')
| -rw-r--r-- | audio/softsynth/mt32.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/softsynth/mt32.cpp b/audio/softsynth/mt32.cpp index b9799db618..4420657854 100644 --- a/audio/softsynth/mt32.cpp +++ b/audio/softsynth/mt32.cpp @@ -199,10 +199,10 @@ int MidiDriver_MT32::open() { _initializing = true; debug(4, _s("Initializing MT-32 Emulator")); _controlFile = new Common::File(); - if (!_controlFile->open("MT32_CONTROL.ROM") && !_controlFile->open("CM32L_CONTROL.ROM")) + if (!_controlFile->open("CM32L_CONTROL.ROM") && !_controlFile->open("MT32_CONTROL.ROM")) error("Error opening MT32_CONTROL.ROM / CM32L_CONTROL.ROM"); _pcmFile = new Common::File(); - if (!_pcmFile->open("MT32_PCM.ROM") && !_pcmFile->open("CM32L_PCM.ROM")) + if (!_pcmFile->open("CM32L_PCM.ROM") && !_pcmFile->open("MT32_PCM.ROM")) error("Error opening MT32_PCM.ROM / CM32L_PCM.ROM"); _controlROM = MT32Emu::ROMImage::makeROMImage(_controlFile); _pcmROM = MT32Emu::ROMImage::makeROMImage(_pcmFile); |