aboutsummaryrefslogtreecommitdiff
path: root/scumm/saveload.cpp
diff options
context:
space:
mode:
authorMax Horn2005-04-26 13:22:46 +0000
committerMax Horn2005-04-26 13:22:46 +0000
commit9421c2a9b9eea44dcc7ac8d7cc1170ebc20f0e45 (patch)
treea95ddab9b122f6d8808c70b02c8abf404f0111bc /scumm/saveload.cpp
parent00f73aeeca5b79035ecce00ea18a371e93dedf9b (diff)
downloadscummvm-rg350-9421c2a9b9eea44dcc7ac8d7cc1170ebc20f0e45.tar.gz
scummvm-rg350-9421c2a9b9eea44dcc7ac8d7cc1170ebc20f0e45.tar.bz2
scummvm-rg350-9421c2a9b9eea44dcc7ac8d7cc1170ebc20f0e45.zip
Call setupVolumes in a more appropriate part of the save/load code
svn-id: r17817
Diffstat (limited to 'scumm/saveload.cpp')
-rw-r--r--scumm/saveload.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index 267758d52f..4ffbf7faf7 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -183,6 +183,9 @@ bool ScummEngine::loadState(int slot, bool compat) {
saveOrLoad(&ser, hdr.ver);
delete in;
+ // Update volume settings
+ setupVolumes();
+
// Normally, _vm->_screenTop should always be >= 0, but for some old save games
// it is not, hence we check & correct it here.
if (_screenTop < 0)
@@ -913,9 +916,6 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) {
// This is probably only needed for Loom.
saveOrLoadCursorImages(s);
-
- if (s->isLoading())
- setupVolumes();
}
void ScummEngine::saveLoadResource(Serializer *ser, int type, int idx) {