aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gameDetector.cpp3
-rw-r--r--scummvm.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/gameDetector.cpp b/gameDetector.cpp
index ce233f908f..827a2b5bdc 100644
--- a/gameDetector.cpp
+++ b/gameDetector.cpp
@@ -463,6 +463,7 @@ int GameDetector::detectMain(int argc, char **argv)
_gfx_mode = GFX_NORMAL;
#endif
_sfx_volume = 100;
+ _music_volume = 60;
#if defined(USE_NULL_DRIVER)
_gfx_driver = GD_NULL;
@@ -493,7 +494,7 @@ int GameDetector::detectMain(int argc, char **argv)
#else
_saveconfig = false;
updateconfig();
- parseCommandLine(argc, argv);
+ parseCommandLine(argc, argv);
#endif
if (_exe_name == NULL) {
diff --git a/scummvm.cpp b/scummvm.cpp
index d7b217bed7..4a40d6cb13 100644
--- a/scummvm.cpp
+++ b/scummvm.cpp
@@ -1395,7 +1395,8 @@ Scumm *Scumm::createFromDetector(GameDetector *detector, OSystem *syst)
imuse->property(IMuse::PROP_MT32_EMULATE, detector->_mt32emulate);
if (detector->_gameTempo != 0)
imuse->property(IMuse::PROP_TEMPO_BASE, detector->_gameTempo);
-
+
+ imuse->set_music_volume(scumm->_sound_volume_music);
scumm->_imuse = imuse;
}