aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2007-01-26 13:09:48 +0000
committerJohannes Schickel2007-01-26 13:09:48 +0000
commit4cf1c3565bee70e415949e314b1f6292e272202b (patch)
treeb2cedd0aa7df6540daa87ad65f75daa97fa29542 /engines/kyra/kyra.cpp
parent78380da9e81faab86bfe71510f23fb0e4f43598b (diff)
downloadscummvm-rg350-4cf1c3565bee70e415949e314b1f6292e272202b.tar.gz
scummvm-rg350-4cf1c3565bee70e415949e314b1f6292e272202b.tar.bz2
scummvm-rg350-4cf1c3565bee70e415949e314b1f6292e272202b.zip
little parameter reodering.
svn-id: r25201
Diffstat (limited to 'engines/kyra/kyra.cpp')
-rw-r--r--engines/kyra/kyra.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp
index bac4760da6..216033f2d1 100644
--- a/engines/kyra/kyra.cpp
+++ b/engines/kyra/kyra.cpp
@@ -151,7 +151,7 @@ int KyraEngine::init() {
// later on here should be a usage of MixedSoundDriver
_sound = new SoundCD(this, _mixer);
} else if (midiDriver == MD_ADLIB && _flags.gameID == GI_KYRA1) {
- _sound = new SoundAdlibPC(_mixer, this);
+ _sound = new SoundAdlibPC(this, _mixer);
assert(_sound);
} else {
bool native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
@@ -162,7 +162,7 @@ int KyraEngine::init() {
driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
}
- SoundMidiPC *soundMidiPc = new SoundMidiPC(driver, _mixer, this);
+ SoundMidiPC *soundMidiPc = new SoundMidiPC(this, _mixer, driver);
_sound = soundMidiPc;
assert(_sound);
soundMidiPc->hasNativeMT32(native_mt32);
@@ -175,7 +175,7 @@ int KyraEngine::init() {
// are decidedly inferior to the Adlib ones.
if (midiDriver != MD_ADLIB && ConfMan.getBool("multi_midi")) {
- SoundAdlibPC *adlib = new SoundAdlibPC(_mixer, this);
+ SoundAdlibPC *adlib = new SoundAdlibPC(this, _mixer);
assert(adlib);
_sound = new MixedSoundDriver(this, _mixer, soundMidiPc, adlib);