diff options
| author | Max Horn | 2003-03-25 15:55:27 +0000 |
|---|---|---|
| committer | Max Horn | 2003-03-25 15:55:27 +0000 |
| commit | c40989548345e00e26b42be5acbe9d11f87685bb (patch) | |
| tree | db35c0bfbf5691beed56ec3ad65afd43335f0dc3 | |
| parent | 023d84a6a3fdecf97c7bebd754b72c044aa58955 (diff) | |
| download | scummvm-rg350-c40989548345e00e26b42be5acbe9d11f87685bb.tar.gz scummvm-rg350-c40989548345e00e26b42be5acbe9d11f87685bb.tar.bz2 scummvm-rg350-c40989548345e00e26b42be5acbe9d11f87685bb.zip | |
make the volume controls in the global options dialog work
svn-id: r6863
| -rw-r--r-- | gui/options.cpp | 5 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 2 | ||||
| -rw-r--r-- | scumm/sound.cpp | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/gui/options.cpp b/gui/options.cpp index 14cf1d90b3..17cb2992e5 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -127,11 +127,11 @@ GlobalOptionsDialog::GlobalOptionsDialog(NewGui *gui, GameDetector &detector) if (dir) { _savePath->setLabel(dir); } else { + // Default to the current directory... char buf[256]; getcwd(buf, sizeof(buf)); _savePath->setLabel(buf); } -// If that is NULL, we should use the current directory... // // Add OK & Cancel buttons @@ -191,6 +191,9 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3 case kOKCmd: // TODO Write back changes made to config object setResult(1); + _detector._master_volume = _soundVolumeMaster; + _detector._music_volume = _soundVolumeMusic; + _detector._sfx_volume = _soundVolumeSfx; close(); break; default: diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 92538a9d94..39c44ab7e0 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -216,7 +216,7 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) _sound = new Sound(this); _timer = Engine::_timer; - _sound->_sound_volume_master = 0; + _sound->_sound_volume_master = detector->_master_volume; _sound->_sound_volume_sfx = detector->_sfx_volume; _sound->_sound_volume_music = detector->_music_volume; diff --git a/scumm/sound.cpp b/scumm/sound.cpp index cb4d3c4dfc..fa9d7956de 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -720,10 +720,6 @@ void Sound::setupSound() { if (_scumm->_imuse) { _scumm->_imuse->setBase(_scumm->res.address[rtSound]); - _sound_volume_music = g_config->getInt("music_volume", kDefaultMusicVolume); - _sound_volume_master = g_config->getInt("master_volume", kDefaultMasterVolume); - _sound_volume_sfx = g_config->getInt("sfx_volume", kDefaultSFXVolume); - _scumm->_imuse->set_master_volume(_sound_volume_master); _scumm->_imuse->set_music_volume(_sound_volume_music); _scumm->_mixer->setVolume(_sound_volume_sfx * _sound_volume_master / 255); |