[Scummvm-cvs-logs] scummvm master -> c822a76a85f6a950d8e04f0c5c16973e2976bf7e

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c822a76a85 KYRA: Little cleanup.


Commit: c822a76a85f6a950d8e04f0c5c16973e2976bf7e
    https://github.com/scummvm/scummvm/commit/c822a76a85f6a950d8e04f0c5c16973e2976bf7e
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-12-30T19:56:29-08:00

Commit Message:
KYRA: Little cleanup.

Changed paths:
    engines/kyra/eobcommon.cpp



diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index f1a6c5d..4f169ac 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);