diff options
| author | Le Philousophe | 2019-06-08 12:19:43 +0200 |
|---|---|---|
| committer | Le Philousophe | 2019-06-08 12:43:22 +0200 |
| commit | 70c7133e4b23adff5d630d4d2a37ac81ef070566 (patch) | |
| tree | 2e6a75269ffdb1fde0811db73cbdbb002180a9be /engines/cryomni3d/versailles | |
| parent | 9fbaf9c73919258e21e420393cf053f413d37856 (diff) | |
| download | scummvm-rg350-70c7133e4b23adff5d630d4d2a37ac81ef070566.tar.gz scummvm-rg350-70c7133e4b23adff5d630d4d2a37ac81ef070566.tar.bz2 scummvm-rg350-70c7133e4b23adff5d630d4d2a37ac81ef070566.zip | |
CRYOMNI3D: Improve compatibility with ScummVM global UI
Diffstat (limited to 'engines/cryomni3d/versailles')
| -rw-r--r-- | engines/cryomni3d/versailles/menus.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/cryomni3d/versailles/menus.cpp b/engines/cryomni3d/versailles/menus.cpp index 305fe1c06b..6da7a856e2 100644 --- a/engines/cryomni3d/versailles/menus.cpp +++ b/engines/cryomni3d/versailles/menus.cpp @@ -85,7 +85,7 @@ uint CryOmni3DEngine_Versailles::displayOptions() { int drawState = 1; uint volumeCursorMiddleY = _sprites.getCursor(102).getHeight() / 2; - uint volume = CLIP(ConfMan.getInt("sfx_volume"), 0, 256); + uint volume = CLIP(ConfMan.getInt("music_volume"), 0, 256); uint soundVolumeY = ((283 * (256 - volume)) >> 8) + 101; byte volumeForeColor = 243; @@ -251,13 +251,15 @@ uint CryOmni3DEngine_Versailles::displayOptions() { volume = CLIP(((384 - soundVolumeY) << 8) / 283, 0u, 256u); // Global setting ConfMan.setInt("music_volume", volume); + // As we modify speech volume, let's unmute it + // Using in-game settings resets all scummvm specific settings + ConfMan.setBool("speech_mute", false); ConfMan.setInt("speech_volume", volume); - ConfMan.setInt("sfx_volume", volume); syncSoundSettings(); } } else if (getDragStatus() == 2 && !_mixer->hasActiveChannelOfType(Audio::Mixer::kMusicSoundType) && - _mixer->getVolumeForSoundType(Audio::Mixer::kSFXSoundType) > 0) { + _mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) > 0) { // Finished dragging _mixer->stopID(SoundIds::kOrgue); do { @@ -275,7 +277,7 @@ uint CryOmni3DEngine_Versailles::displayOptions() { break; } - _mixer->playStream(Audio::Mixer::kSFXSoundType, nullptr, audioDecoder, SoundIds::kOrgue); + _mixer->playStream(Audio::Mixer::kMusicSoundType, nullptr, audioDecoder, SoundIds::kOrgue); // We lost ownership of the audioDecoder just set it to nullptr and don't use it audioDecoder = nullptr; } while (false); |