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
This commit is contained in:
parent
b38995b288
commit
0bcc7ce80e
7 changed files with 117 additions and 178 deletions
|
@ -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"));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue