aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorMax Horn2003-08-06 00:19:20 +0000
committerMax Horn2003-08-06 00:19:20 +0000
commit77d3e9333be2570c808aa8d6fed71bca6fd3b9df (patch)
tree49a6dd82c4dfbcfd9ce9130170e3fd5d5b73b9e9 /simon
parent75db41750ef0ae4ad3d2b86f016fe21f67160fc4 (diff)
downloadscummvm-rg350-77d3e9333be2570c808aa8d6fed71bca6fd3b9df.tar.gz
scummvm-rg350-77d3e9333be2570c808aa8d6fed71bca6fd3b9df.tar.bz2
scummvm-rg350-77d3e9333be2570c808aa8d6fed71bca6fd3b9df.zip
must create adlib driver *after* calling _mixer->bindToSystem
svn-id: r9528
Diffstat (limited to 'simon')
-rw-r--r--simon/simon.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 7aeebb7402..a10a77aada 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -441,6 +441,12 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
"\x5\x5\x4\x6\x5\x3\x4\x5\x6\x3\x5\x5\x4\x6\x5\x3\x4\x6\x5\x6\x6\x6\x5\x5\x5\x6\x5\x6\x6\x6\x6\x6", 32);
+ // Setup mixer
+ if (!_mixer->bindToSystem(syst))
+ warning("Sound initialization failed. "
+ "Features of the game that depend on sound synchronization will most likely break");
+ set_volume(detector->_sfx_volume);
+
// Setup midi driver
if (!driver)
driver = MidiDriver_ADLIB_create(_mixer);
@@ -450,13 +456,7 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
int ret = midi.open();
if (ret)
warning ("MIDI Player init failed: \"%s\"", midi.getErrorName (ret));
-
- // Setup mixer
- if (!_mixer->bindToSystem(syst))
- warning("Sound initialization failed. "
- "Features of the game that depend on sound synchronization will most likely break");
midi.set_volume(detector->_music_volume);
- set_volume(detector->_sfx_volume);
_debugMode = detector->_debugMode;
_debugLevel = detector->_debugLevel;