diff options
| author | Max Horn | 2003-11-11 00:40:35 +0000 |
|---|---|---|
| committer | Max Horn | 2003-11-11 00:40:35 +0000 |
| commit | 0bcc7ce80eb6a8daa35bf2591281974cceff8078 (patch) | |
| tree | 570ec89c06a94d71ceb5219c4c17010c0da64331 /scumm/saveload.cpp | |
| parent | b38995b288f2c5014ff1a9867d12807182ceb051 (diff) | |
| download | scummvm-rg350-0bcc7ce80eb6a8daa35bf2591281974cceff8078.tar.gz scummvm-rg350-0bcc7ce80eb6a8daa35bf2591281974cceff8078.tar.bz2 scummvm-rg350-0bcc7ce80eb6a8daa35bf2591281974cceff8078.zip | |
made Scumm::OptionsDialog subclass GUI::OptionsDialog (code reuse); replaced Sound::_sound_volume_master and friends by ConfMan.get() calls; some whitespace cleanup
svn-id: r11257
Diffstat (limited to 'scumm/saveload.cpp')
| -rw-r--r-- | scumm/saveload.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index 6daef9eda9..856e0d09df 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -677,8 +677,8 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) { if (_imuse && (_saveSound || !_saveLoadCompatible)) { _imuse->save_or_load(s, this); - _imuse->setMasterVolume(_sound->_sound_volume_master); - _imuse->set_music_volume(_sound->_sound_volume_music); + _imuse->setMasterVolume(ConfMan.getInt("master_volume")); + _imuse->set_music_volume(ConfMan.getInt("music_volume")); } } |