diff options
| author | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
| commit | 00279659b22cbd5db739d5351e83a9fc2a2ae408 (patch) | |
| tree | 497f06f46820043cbdf1725652b8f0073223e24a /engines/sky/sky.cpp | |
| parent | d932df79bed5aac97e17c0920a5e75cb5ce733ee (diff) | |
| parent | d1628feb761acc9f4607f64de3eb620fea53bcc9 (diff) | |
| download | scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.gz scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.bz2 scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'engines/sky/sky.cpp')
| -rw-r--r-- | engines/sky/sky.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp index 72abc26f32..44ea3a305b 100644 --- a/engines/sky/sky.cpp +++ b/engines/sky/sky.cpp @@ -268,9 +268,9 @@ Common::Error SkyEngine::init() { } else { _systemVars.systemFlags |= SF_ROLAND; if ((MidiDriver::getMusicType(dev) == MT_MT32) || ConfMan.getBool("native_mt32")) - _skyMusic = new MT32Music(MidiDriver::createMidi(dev), _skyDisk); + _skyMusic = new MT32Music(MidiDriver::createMidi(dev), _mixer, _skyDisk); else - _skyMusic = new GmMusic(MidiDriver::createMidi(dev), _skyDisk); + _skyMusic = new GmMusic(MidiDriver::createMidi(dev), _mixer, _skyDisk); } if (isCDVersion()) { |