aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2013-01-22 16:43:31 +0100
committerEinar Johan Trøan Sømåen2013-01-22 16:43:31 +0100
commit472f722556e33381af1d44cde93aa2e75ce2e169 (patch)
tree4f10bb7cc326a6f569894942770cd168532a5fbf /engines
parent4ba603807a1ec8ba0b65aff102a8578b1b59fd95 (diff)
downloadscummvm-rg350-472f722556e33381af1d44cde93aa2e75ce2e169.tar.gz
scummvm-rg350-472f722556e33381af1d44cde93aa2e75ce2e169.tar.bz2
scummvm-rg350-472f722556e33381af1d44cde93aa2e75ce2e169.zip
WINTERMUTE: Store MasterVolume in % instead of 0-255 to ConfMan.
Diffstat (limited to 'engines')
-rw-r--r--engines/wintermute/base/sound/base_sound_manager.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/wintermute/base/sound/base_sound_manager.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp
index 432e0a6d6a..7e4a70afb2 100644
--- a/engines/wintermute/base/sound/base_sound_manager.cpp
+++ b/engines/wintermute/base/sound/base_sound_manager.cpp
@@ -73,7 +73,7 @@ bool BaseSoundMgr::cleanup() {
//////////////////////////////////////////////////////////////////////////
void BaseSoundMgr::saveSettings() {
if (_soundAvailable) {
- ConfMan.setInt("master_volume", _volumeMaster);
+ ConfMan.setInt("master_volume_percent", _volumeMasterPercent);
}
}
@@ -84,7 +84,8 @@ bool BaseSoundMgr::initialize() {
if (!g_system->getMixer()->isReady()) {
return STATUS_FAILED;
}
- _volumeMaster = (ConfMan.hasKey("master_volume") ? ConfMan.getInt("master_volume") : 255);
+ byte volumeMasterPercent = (ConfMan.hasKey("master_volume_percent") ? ConfMan.getInt("master_volume_percent") : 100);
+ setMasterVolumePercent(volumeMasterPercent);
_soundAvailable = true;
return STATUS_OK;