diff options
author | Johannes Schickel | 2007-01-26 13:09:48 +0000 |
---|---|---|
committer | Johannes Schickel | 2007-01-26 13:09:48 +0000 |
commit | 4cf1c3565bee70e415949e314b1f6292e272202b (patch) | |
tree | b2cedd0aa7df6540daa87ad65f75daa97fa29542 /engines/kyra | |
parent | 78380da9e81faab86bfe71510f23fb0e4f43598b (diff) | |
download | scummvm-rg350-4cf1c3565bee70e415949e314b1f6292e272202b.tar.gz scummvm-rg350-4cf1c3565bee70e415949e314b1f6292e272202b.tar.bz2 scummvm-rg350-4cf1c3565bee70e415949e314b1f6292e272202b.zip |
little parameter reodering.
svn-id: r25201
Diffstat (limited to 'engines/kyra')
-rw-r--r-- | engines/kyra/kyra.cpp | 6 | ||||
-rw-r--r-- | engines/kyra/sound.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/sound.h | 4 | ||||
-rw-r--r-- | engines/kyra/sound_adlib.cpp | 2 |
4 files changed, 7 insertions, 7 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); diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 0e56af2354..e0e41e69ae 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -95,7 +95,7 @@ bool Sound::voiceIsPlaying() { #pragma mark - -SoundMidiPC::SoundMidiPC(MidiDriver *driver, Audio::Mixer *mixer, KyraEngine *engine) : Sound(engine, mixer) { +SoundMidiPC::SoundMidiPC(KyraEngine *engine, Audio::Mixer *mixer, MidiDriver *driver) : Sound(engine, mixer) { _driver = driver; _passThrough = false; _eventFromMusic = false; diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h index 4230006e4e..07ef0a59f0 100644 --- a/engines/kyra/sound.h +++ b/engines/kyra/sound.h @@ -119,7 +119,7 @@ class AdlibDriver; class SoundAdlibPC : public Sound { public: - SoundAdlibPC(Audio::Mixer *mixer, KyraEngine *engine); + SoundAdlibPC(KyraEngine *engine, Audio::Mixer *mixer); ~SoundAdlibPC(); bool init(); @@ -163,7 +163,7 @@ private: class SoundMidiPC : public MidiDriver, public Sound { public: - SoundMidiPC(MidiDriver *driver, Audio::Mixer *mixer, KyraEngine *engine); + SoundMidiPC(KyraEngine *engine, Audio::Mixer *mixer, MidiDriver *driver); ~SoundMidiPC(); bool init() { return true; } diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp index 4a300ad1e3..d0cabc8bd8 100644 --- a/engines/kyra/sound_adlib.cpp +++ b/engines/kyra/sound_adlib.cpp @@ -2206,7 +2206,7 @@ const int SoundAdlibPC::_kyra1SoundTriggers[] = { const int SoundAdlibPC::_kyra1NumSoundTriggers = ARRAYSIZE(SoundAdlibPC::_kyra1SoundTriggers); -SoundAdlibPC::SoundAdlibPC(Audio::Mixer *mixer, KyraEngine *engine) +SoundAdlibPC::SoundAdlibPC(KyraEngine *engine, Audio::Mixer *mixer) : Sound(engine, mixer), _driver(0), _trackEntries(), _soundDataPtr(0) { memset(_trackEntries, 0, sizeof(_trackEntries)); _driver = new AdlibDriver(mixer); |