diff options
| author | dhewg | 2011-03-19 15:10:37 +0100 |
|---|---|---|
| committer | dhewg | 2011-03-19 16:49:16 +0100 |
| commit | 58f1e2f6effe194fef411264d069552f97d51f8c (patch) | |
| tree | 7cfdcd954e4d149ed5000bfeae87f48402c94400 | |
| parent | e5b6146b78741033973ed830cf7132809a57b4b6 (diff) | |
| download | scummvm-rg350-58f1e2f6effe194fef411264d069552f97d51f8c.tar.gz scummvm-rg350-58f1e2f6effe194fef411264d069552f97d51f8c.tar.bz2 scummvm-rg350-58f1e2f6effe194fef411264d069552f97d51f8c.zip | |
TOUCHE: Cleanup syncSoundSettings()
And respect global mute settings
| -rw-r--r-- | engines/touche/touche.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp index 97d533f29f..6b47a7fc4d 100644 --- a/engines/touche/touche.cpp +++ b/engines/touche/touche.cpp @@ -44,7 +44,6 @@ namespace Touche { ToucheEngine::ToucheEngine(OSystem *system, Common::Language language) : Engine(system), _midiPlayer(0), _language(language) { - _saveLoadCurrentPage = 0; _saveLoadCurrentSlot = 0; _hideInventoryTexts = false; @@ -103,9 +102,8 @@ Common::Error ToucheEngine::run() { _midiPlayer = new MidiPlayer; - _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); - _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume")); - _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume")); + // Setup mixer + syncSoundSettings(); res_openDataFile(); res_allocateTables(); @@ -245,10 +243,9 @@ Common::Point ToucheEngine::getMousePos() const { } void ToucheEngine::syncSoundSettings() { + Engine::syncSoundSettings(); + readConfigurationSettings(); - _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); - _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume")); - _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume")); } void ToucheEngine::mainLoop() { |