diff options
| -rw-r--r-- | scumm/scummvm.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index bb7db94030..f85984352a 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -566,8 +566,8 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) _timer = Engine::_timer; _sound->_sound_volume_master = detector->_master_volume; - _sound->_sound_volume_sfx = detector->_sfx_volume; - _sound->_sound_volume_music = detector->_music_volume; + _sound->_sound_volume_sfx = detector->_sfx_volume; + _sound->_sound_volume_music = detector->_music_volume; // Override global scaler with any game-specific define if (g_config->get("gfx_mode")) { @@ -2295,7 +2295,9 @@ void Scumm::launch() { _sound->setupSound(); - runScript(1, 0, 0, &_bootParam); + // If requested, load a save game instead of running the boot script + if (_saveLoadFlag != 2 || !loadState(_saveLoadSlot, _saveLoadCompatible)) + runScript(1, 0, 0, &_bootParam); } void Scumm::go() { |