diff options
author | Christopher Page | 2008-06-30 17:44:21 +0000 |
---|---|---|
committer | Christopher Page | 2008-06-30 17:44:21 +0000 |
commit | 30c52e215c1e733de97edb10b313186cf90d8743 (patch) | |
tree | c67d5c3e8eea2bd468a6484085e6878a45b422de /engines/scumm/scumm.cpp | |
parent | e36166bda291f6f0af8af3328efce5aa4b83cd9a (diff) | |
download | scummvm-rg350-30c52e215c1e733de97edb10b313186cf90d8743.tar.gz scummvm-rg350-30c52e215c1e733de97edb10b313186cf90d8743.tar.bz2 scummvm-rg350-30c52e215c1e733de97edb10b313186cf90d8743.zip |
Scumm sound settings can now be changed from the gmm
svn-id: r32851
Diffstat (limited to 'engines/scumm/scumm.cpp')
-rw-r--r-- | engines/scumm/scumm.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 5e65364919..859f8320a2 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1108,7 +1108,7 @@ int ScummEngine::init() { if (_game.version >= 5 && _game.version <= 7) _sound->setupSound(); - updateSoundSettings(); + syncSoundSettings(); return 0; } @@ -1667,7 +1667,7 @@ void ScummEngine::setupMusic(int midi) { } } -void ScummEngine::updateSoundSettings() { +void ScummEngine::syncSoundSettings() { // Sync the engine with the config manager int soundVolumeMusic = ConfMan.getInt("music_volume"); @@ -2309,7 +2309,7 @@ void ScummEngine::mainMenuDialog() { if (!_mainMenuDialog) _mainMenuDialog = new MainMenuDialog(this); runDialog(*_mainMenuDialog); - updateSoundSettings(); + syncSoundSettings(); } void ScummEngine::confirmExitDialog() { |