diff options
| author | Jamieson Christian | 2002-12-21 20:12:14 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2002-12-21 20:12:14 +0000 |
| commit | 37de3f1836baeae2e30083a76d20f572d0c77e0c (patch) | |
| tree | 9991d1e30b6fc74044f64bd73a17d787d3d4534b /scumm/scummvm.cpp | |
| parent | f60bda7d5ccbb721f716c61434b23956e573403e (diff) | |
| download | scummvm-rg350-37de3f1836baeae2e30083a76d20f572d0c77e0c.tar.gz scummvm-rg350-37de3f1836baeae2e30083a76d20f572d0c77e0c.tar.bz2 scummvm-rg350-37de3f1836baeae2e30083a76d20f572d0c77e0c.zip | |
Fixed problem with multiple IMuseDrivers being created.
svn-id: r6045
Diffstat (limited to 'scumm/scummvm.cpp')
| -rw-r--r-- | scumm/scummvm.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 7ca2e0e017..afce014a7b 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -151,21 +151,13 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) _imuseDigital = new IMuseDigital(this); _imuse = NULL; } else { - if (detector->_use_adlib && false) { - _imuse = IMuse::create_adlib(syst, _mixer); - } else { - void *midiTemp = detector->createMidi(); - if (!midiTemp) { // Fallback to Adlib - _imuse = IMuse::create_adlib(syst, _mixer); - } else { - _imuse = IMuse::create_midi(syst, detector->createMidi()); - } - } - _imuseDigital = NULL; - if (detector->_gameTempo != 0) - _imuse->property(IMuse::PROP_TEMPO_BASE, detector->_gameTempo); - _imuse->set_music_volume(_sound->_sound_volume_music); + _imuse = IMuse::create_midi(syst, detector->createMidi()); + if (_imuse) { + if (detector->_gameTempo != 0) + _imuse->property(IMuse::PROP_TEMPO_BASE, detector->_gameTempo); + _imuse->set_music_volume(_sound->_sound_volume_music); + } } #endif // ph0x-hack |