diff options
author | Johannes Schickel | 2011-12-31 04:55:46 +0100 |
---|---|---|
committer | Johannes Schickel | 2011-12-31 04:56:29 +0100 |
commit | c822a76a85f6a950d8e04f0c5c16973e2976bf7e (patch) | |
tree | 76d63704c026eb3918ed99c1e07ccce74746c229 /engines | |
parent | b704e40bae69dcdc54b85e934ec3862d60bfdb5b (diff) | |
download | scummvm-rg350-c822a76a85f6a950d8e04f0c5c16973e2976bf7e.tar.gz scummvm-rg350-c822a76a85f6a950d8e04f0c5c16973e2976bf7e.tar.bz2 scummvm-rg350-c822a76a85f6a950d8e04f0c5c16973e2976bf7e.zip |
KYRA: Little cleanup.
Diffstat (limited to 'engines')
-rw-r--r-- | engines/kyra/eobcommon.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp index f1a6c5d699..4f169acabf 100644 --- a/engines/kyra/eobcommon.cpp +++ b/engines/kyra/eobcommon.cpp @@ -363,20 +363,15 @@ Common::Error EoBCoreEngine::init() { _tickLength = 55; _screen = new Screen_EoB(this, _system); - assert(_screen); _screen->setResolution(); - // Setup mixer - _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); - _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume")); - _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume")); - //MidiDriverType midiDriver = MidiDriver::detectDevice(MDT_PCSPK | MDT_ADLIB); _sound = new SoundAdLibPC(this, _mixer); assert(_sound); _sound->init(); + // Setup volume settings syncSoundSettings(); _res = new Resource(this); @@ -398,6 +393,7 @@ Common::Error EoBCoreEngine::init() { } setupKeyMap(); + _gui = new GUI_EoB(this); assert(_gui); _txt = new TextDisplayer_rpg(this, _screen); |