From 1ae87c0fbbbb38950e2364da212adeb96d464d0c Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 28 Nov 2004 21:24:02 +0000
Subject: 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
---
 scumm/saveload.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'scumm/saveload.cpp')

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) {
-- 
cgit v1.2.3