aboutsummaryrefslogtreecommitdiff
path: root/engines/touche
diff options
context:
space:
mode:
authorChristopher Page2008-07-01 03:21:30 +0000
committerChristopher Page2008-07-01 03:21:30 +0000
commit718a85e30d26a8b3167842fe9ea24b648647fa72 (patch)
tree3e8d48ab043b9cb86dace963c3c394545a29ab81 /engines/touche
parent9c60fd183c8bc8f867a5dd5116c1195586342db6 (diff)
downloadscummvm-rg350-718a85e30d26a8b3167842fe9ea24b648647fa72.tar.gz
scummvm-rg350-718a85e30d26a8b3167842fe9ea24b648647fa72.tar.bz2
scummvm-rg350-718a85e30d26a8b3167842fe9ea24b648647fa72.zip
Sound settings for TOUCHE can be configured through the GMM
svn-id: r32864
Diffstat (limited to 'engines/touche')
-rw-r--r--engines/touche/touche.cpp9
-rw-r--r--engines/touche/touche.h1
2 files changed, 9 insertions, 1 deletions
diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp
index 5813943da5..4f49b87847 100644
--- a/engines/touche/touche.cpp
+++ b/engines/touche/touche.cpp
@@ -99,7 +99,7 @@ int ToucheEngine::init() {
_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));
- _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, Audio::Mixer::kMaxMixerVolume);
+ _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
return 0;
}
@@ -238,6 +238,13 @@ Common::Point ToucheEngine::getMousePos() const {
return _eventMan->getMousePos();
}
+void ToucheEngine::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() {
restart();
diff --git a/engines/touche/touche.h b/engines/touche/touche.h
index c1bc12655f..f5ac492550 100644
--- a/engines/touche/touche.h
+++ b/engines/touche/touche.h
@@ -356,6 +356,7 @@ public:
virtual int init();
virtual int go();
+ virtual void syncSoundSettings();
protected: