diff options
| author | Max Horn | 2004-11-28 21:24:02 +0000 |
|---|---|---|
| committer | Max Horn | 2004-11-28 21:24:02 +0000 |
| commit | 1ae87c0fbbbb38950e2364da212adeb96d464d0c (patch) | |
| tree | ca2ce9c9325468b6d6f1b1c8f799bb81853824a5 /scumm/saveload.cpp | |
| parent | 6c84bbf2bd808c7e72cdcc9e5d5f68562916606b (diff) | |
| download | scummvm-rg350-1ae87c0fbbbb38950e2364da212adeb96d464d0c.tar.gz scummvm-rg350-1ae87c0fbbbb38950e2364da212adeb96d464d0c.tar.bz2 scummvm-rg350-1ae87c0fbbbb38950e2364da212adeb96d464d0c.zip | |
Trying to cleanup the volume control mess inside the SCUMM engine: renamed MusicEngine::setMasterVolume to setMusicVolume; fixed iMuse to use the correct method for setMusicVolume (previously modified the iMuse internal volume control); hooked up the volume control of various other music engines; added ScummEngine::setupVolume method which can be called whenever volume settings change, and which gurantees that those are handled uniformly
svn-id: r15944
Diffstat (limited to 'scumm/saveload.cpp')
| -rw-r--r-- | scumm/saveload.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index 381da99c59..d4ee6c2d62 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -870,13 +870,14 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) { if (_imuse && (_saveSound || !_saveTemporaryState)) { _imuse->save_or_load(s, this); - _imuse->setMasterVolume(ConfMan.getInt("master_volume")); - _imuse->set_music_volume(ConfMan.getInt("music_volume")); } if (_imuseDigital) { _imuseDigital->saveOrLoad(s); } + + if (s->isLoading()) + setupVolumes(); } void ScummEngine::saveLoadResource(Serializer *ser, int type, int idx) { |