diff options
| author | Thanasis Antoniou | 2019-06-21 14:55:26 +0300 |
|---|---|---|
| committer | Thanasis Antoniou | 2019-06-21 16:09:58 +0300 |
| commit | 12b5dde457cb69e7e8e7136628889f57f4ecfd04 (patch) | |
| tree | 6bec8c5a4126a53127e90642ae984acd0298d297 /engines/bladerunner/bladerunner.cpp | |
| parent | 80f163b0fc7fc033aa99b829f626784804bf5176 (diff) | |
| download | scummvm-rg350-12b5dde457cb69e7e8e7136628889f57f4ecfd04.tar.gz scummvm-rg350-12b5dde457cb69e7e8e7136628889f57f4ecfd04.tar.bz2 scummvm-rg350-12b5dde457cb69e7e8e7136628889f57f4ecfd04.zip | |
BLADERUNNER: Fix max volume in VQAs with audio stream
Closes #10987
Diffstat (limited to 'engines/bladerunner/bladerunner.cpp')
| -rw-r--r-- | engines/bladerunner/bladerunner.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp index 0966b6cf8e..45bd857d0f 100644 --- a/engines/bladerunner/bladerunner.cpp +++ b/engines/bladerunner/bladerunner.cpp @@ -465,20 +465,6 @@ bool BladeRunnerEngine::startup(bool hasSavegames) { _gameFlags = new GameFlags(); _gameFlags->setFlagCount(_gameInfo->getFlagCount()); - // Assign default values to the ScummVM configuration manager, in case settings are missing - ConfMan.registerDefault("subtitles", "true"); - ConfMan.registerDefault("sfx_volume", 192); - ConfMan.registerDefault("music_volume", 192); - ConfMan.registerDefault("speech_volume", 192); - ConfMan.registerDefault("mute", "false"); - ConfMan.registerDefault("speech_mute", "false"); - - // get value from the ScummVM configuration manager - syncSoundSettings(); - - _sitcomMode = ConfMan.getBool("sitcom"); - _shortyMode = ConfMan.getBool("shorty"); - _items = new Items(this); _audioCache = new AudioCache(); @@ -493,6 +479,19 @@ bool BladeRunnerEngine::startup(bool hasSavegames) { _ambientSounds = new AmbientSounds(this); + // Assign default values to the ScummVM configuration manager, in case settings are missing + ConfMan.registerDefault("subtitles", "true"); + ConfMan.registerDefault("sfx_volume", 192); + ConfMan.registerDefault("music_volume", 192); + ConfMan.registerDefault("speech_volume", 192); + ConfMan.registerDefault("mute", "false"); + ConfMan.registerDefault("speech_mute", "false"); + + // get value from the ScummVM configuration manager + syncSoundSettings(); + + _sitcomMode = ConfMan.getBool("sitcom"); + _shortyMode = ConfMan.getBool("shorty"); // BLADE.INI was read here, but it was replaced by ScummVM configuration _chapters = new Chapters(this); @@ -1844,16 +1843,17 @@ void BladeRunnerEngine::syncSoundSettings() { _mixer->setVolumeForSoundType(_mixer->kMusicSoundType, ConfMan.getInt("music_volume")); _mixer->setVolumeForSoundType(_mixer->kSFXSoundType, ConfMan.getInt("sfx_volume")); _mixer->setVolumeForSoundType(_mixer->kSpeechSoundType, ConfMan.getInt("speech_volume")); - // debug("syncSoundSettings: Volumes synced as Music: %d, Sfx: %d, Speech: %d", ConfMan.getInt("music_volume"), ConfMan.getInt("sfx_volume"), ConfMan.getInt("speech_volume")); + bool allSoundIsMuted = false; if (ConfMan.hasKey("mute")) { - _mixer->muteSoundType(_mixer->kMusicSoundType, ConfMan.getBool("mute")); - _mixer->muteSoundType(_mixer->kSFXSoundType, ConfMan.getBool("mute")); - _mixer->muteSoundType(_mixer->kSpeechSoundType, ConfMan.getBool("mute")); + allSoundIsMuted = ConfMan.getBool("mute"); + _mixer->muteSoundType(_mixer->kMusicSoundType, allSoundIsMuted); + _mixer->muteSoundType(_mixer->kSFXSoundType, allSoundIsMuted); + _mixer->muteSoundType(_mixer->kSpeechSoundType, allSoundIsMuted); } - if (ConfMan.hasKey("speech_mute")) { + if (ConfMan.hasKey("speech_mute") && !allSoundIsMuted) { // if true it means show only subtitles // "subtitles" key will already be set appropriately by Engine::syncSoundSettings(); // but we need to mute the speech |