aboutsummaryrefslogtreecommitdiff
path: root/engines/tinsel/tinsel.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2010-08-25 07:41:35 +0000
committerEugene Sandulenko2010-08-25 07:41:35 +0000
commit99c9ba697c0ae0296a3042166e09171123000525 (patch)
tree41f85010ecf789fd99f0bd6d0de332e3a9267959 /engines/tinsel/tinsel.cpp
parentfcdb349fa2bf4d93254ca38037483010e6a6c819 (diff)
downloadscummvm-rg350-99c9ba697c0ae0296a3042166e09171123000525.tar.gz
scummvm-rg350-99c9ba697c0ae0296a3042166e09171123000525.tar.bz2
scummvm-rg350-99c9ba697c0ae0296a3042166e09171123000525.zip
TINSEL: Fix bug #3032780: "DW: Mute setting does not work"
Bug #3032778 was fixed too as it is the duplicate. Since there is no engine-specific logic, rely on superclass' setupSoundSettings(), and use it on startup too. svn-id: r52374
Diffstat (limited to 'engines/tinsel/tinsel.cpp')
-rw-r--r--engines/tinsel/tinsel.cpp14
1 files changed, 1 insertions, 13 deletions
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index 0f5b27c85a..248c97e209 100644
--- a/engines/tinsel/tinsel.cpp
+++ b/engines/tinsel/tinsel.cpp
@@ -834,8 +834,7 @@ TinselEngine::TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc)
DebugMan.addDebugChannel(kTinselDebugMusic, "music", "Music debugging");
// Setup mixer
- _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
- _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
+ syncSoundSettings();
// Add DW2 subfolder to search path in case user is running directly from the CDs
const Common::FSNode gameDataDir(ConfMan.get("path"));
@@ -907,17 +906,6 @@ TinselEngine::~TinselEngine() {
MemoryDeinit();
}
-void TinselEngine::syncSoundSettings() {
- // Sync the engine with the config manager
- int soundVolumeMusic = ConfMan.getInt("music_volume");
- int soundVolumeSFX = ConfMan.getInt("sfx_volume");
- int soundVolumeSpeech = ConfMan.getInt("speech_volume");
-
- _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, soundVolumeMusic);
- _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, soundVolumeSFX);
- _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, soundVolumeSpeech);
-}
-
Common::String TinselEngine::getSavegameFilename(int16 saveNum) const {
char filename[256];
snprintf(filename, 256, "%s.%03d", getTargetName().c_str(), saveNum);