From 58f1e2f6effe194fef411264d069552f97d51f8c Mon Sep 17 00:00:00 2001
From: dhewg
Date: Sat, 19 Mar 2011 15:10:37 +0100
Subject: TOUCHE: Cleanup syncSoundSettings()
And respect global mute settings
---
engines/touche/touche.cpp | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
(limited to 'engines')
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() {
--
cgit v1.2.3