mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-31 07:53:36 +00:00
change behaviour for loading save games from the command line so that if you load a COMI save game from disk 2, you don't have to first insert disk 1
svn-id: r7910
This commit is contained in:
parent
3fda1e4a7c
commit
684b7288f3
@ -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() {
|
||||
|
Loading…
x
Reference in New Issue
Block a user