diff options
| author | Filippos Karapetis | 2013-02-04 23:13:15 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2013-02-04 23:13:53 +0200 |
| commit | 059f5ee1383bb198f3af3f8c1c6a6514dce33723 (patch) | |
| tree | dcffc2181b0bd4e0878088eb7853e50feff25964 /audio/softsynth/mt32.cpp | |
| parent | e2a8c8ea86f7f385f3ad1263a16fc345c8bc9858 (diff) | |
| download | scummvm-rg350-059f5ee1383bb198f3af3f8c1c6a6514dce33723.tar.gz scummvm-rg350-059f5ee1383bb198f3af3f8c1c6a6514dce33723.tar.bz2 scummvm-rg350-059f5ee1383bb198f3af3f8c1c6a6514dce33723.zip | |
MT32: Also attempt to load roms named CM32L_CONTROL.ROM / CM32L_PCM.ROM
This was accidentally removed in commit 5711d23
Diffstat (limited to 'audio/softsynth/mt32.cpp')
| -rw-r--r-- | audio/softsynth/mt32.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/audio/softsynth/mt32.cpp b/audio/softsynth/mt32.cpp index 6813363fd5..d9744924aa 100644 --- a/audio/softsynth/mt32.cpp +++ b/audio/softsynth/mt32.cpp @@ -204,11 +204,11 @@ int MidiDriver_MT32::open() { _initializing = true; debug(4, _s("Initializing MT-32 Emulator")); _controlFile = new Common::File(); - if (!_controlFile->open("MT32_CONTROL.ROM")) - error("Error opening MT32_CONTROL.ROM"); + if (!_controlFile->open("MT32_CONTROL.ROM") && !_controlFile->open("CM32L_CONTROL.ROM")) + error("Error opening MT32_CONTROL.ROM / CM32L_CONTROL.ROM"); _pcmFile = new Common::File(); - if (!_pcmFile->open("MT32_PCM.ROM")) - error("Error opening MT32_PCM.ROM"); + if (!_pcmFile->open("MT32_PCM.ROM") && !_pcmFile->open("CM32L_PCM.ROM")) + error("Error opening MT32_PCM.ROM / CM32L_PCM.ROM"); _controlROM = MT32Emu::ROMImage::makeROMImage(_controlFile); _pcmROM = MT32Emu::ROMImage::makeROMImage(_pcmFile); if (!_synth->open(*_controlROM, *_pcmROM)) |