aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorMax Horn2006-04-30 20:35:43 +0000
committerMax Horn2006-04-30 20:35:43 +0000
commit39e887d6aa56b06fb57c6f8ff52aa39da24c11a7 (patch)
tree5689c57c1f8d6f8e2fd49d849a32d2a3493c46a4 /engines/scumm
parentf8b0649d18b5b4522110a9fd89fc6d62cbc65e07 (diff)
downloadscummvm-rg350-39e887d6aa56b06fb57c6f8ff52aa39da24c11a7.tar.gz
scummvm-rg350-39e887d6aa56b06fb57c6f8ff52aa39da24c11a7.tar.bz2
scummvm-rg350-39e887d6aa56b06fb57c6f8ff52aa39da24c11a7.zip
Invoke updateSoundSettings a bit later, since it can only correctly set VAR_VOICE_MODE *after* setupScummVars() has been called
svn-id: r22247
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/scumm.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index ee7ea1af9c..1ffb9ae534 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -969,6 +969,8 @@ int ScummEngine::init() {
if (_game.version >= 5)
_sound->setupSound();
+ updateSoundSettings();
+
return 0;
}
@@ -1470,8 +1472,6 @@ void ScummEngine::setupMusic(int midi) {
_imuse->property(IMuse::PROP_DIRECT_PASSTHROUGH, 1);
}
}
-
- updateSoundSettings();
}
void ScummEngine::updateSoundSettings() {