aboutsummaryrefslogtreecommitdiff
path: root/scumm/dialogs.cpp
diff options
context:
space:
mode:
authorMax Horn2003-09-08 17:06:44 +0000
committerMax Horn2003-09-08 17:06:44 +0000
commit90ec1dc34ea403c0e23ff820d5ca20a7b9ca0140 (patch)
treea47b34c14b75823700d2e9bbb67507c4a29ebd66 /scumm/dialogs.cpp
parent07cfd2d0eeb03cb1c44088024b48d919225720da (diff)
downloadscummvm-rg350-90ec1dc34ea403c0e23ff820d5ca20a7b9ca0140.tar.gz
scummvm-rg350-90ec1dc34ea403c0e23ff820d5ca20a7b9ca0140.tar.bz2
scummvm-rg350-90ec1dc34ea403c0e23ff820d5ca20a7b9ca0140.zip
make even more use of Scumm::_musicEngine; added MusicEngine::setMasterVolume
svn-id: r10097
Diffstat (limited to 'scumm/dialogs.cpp')
-rw-r--r--scumm/dialogs.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp
index 4470d2a530..edfa8f5d41 100644
--- a/scumm/dialogs.cpp
+++ b/scumm/dialogs.cpp
@@ -536,10 +536,9 @@ void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
if (_scumm->_imuse) {
_scumm->_imuse->set_music_volume(_soundVolumeMusic);
- _scumm->_imuse->setMasterVolume(_soundVolumeMaster);
}
- if (_scumm->_playerV2) {
- _scumm->_playerV2->setMasterVolume(_soundVolumeMaster);
+ if (_scumm->_musicEngine) {
+ _scumm->_musicEngine->setMasterVolume(_soundVolumeMaster);
}
_scumm->_mixer->setVolume(_soundVolumeSfx * _soundVolumeMaster / 255);