[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.179,2.180

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv6591

Modified Files:
	scummvm.cpp 
Log Message:
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

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.179
retrieving revision 2.180
diff -u -d -r2.179 -r2.180
--- scummvm.cpp	24 May 2003 22:17:45 -0000	2.179
+++ scummvm.cpp	24 May 2003 22:42:26 -0000	2.180
@@ -566,8 +566,8 @@
 	_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 @@
 
 	_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() {