[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.275,1.276

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16230

Modified Files:
	scumm.cpp 
Log Message:
Moved bootscript loading into go(), where it belongs

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -d -r1.275 -r1.276
--- scumm.cpp	23 Nov 2004 00:03:20 -0000	1.275
+++ scumm.cpp	23 Nov 2004 09:36:46 -0000	1.276
@@ -1066,7 +1066,7 @@
 	}
 
 	if (_features & GF_OLD_BUNDLE)
-		_resourceHeaderSize = 4; // FIXME - to be rechecked
+		_resourceHeaderSize = 4;
 	else if (_features & GF_SMALL_HEADER)
 		_resourceHeaderSize = 6;
 	else
@@ -1099,22 +1099,6 @@
 	if (!_debugger)
 		_debugger = new ScummDebugger(this);
 
-
-	// If requested, load a save game instead of running the boot script
-	if (_saveLoadFlag != 2 || !loadState(_saveLoadSlot, _saveTemporaryState)) {
-		int args[16];
-		memset(args, 0, sizeof(args));
-		args[0] = _bootParam;	
-
-		_saveLoadFlag = 0;
-		if (_gameId == GID_MANIAC && _demoMode)
-			runScript(9, 0, 0, args);
-		else
-			runScript(1, 0, 0, args);
-	} else {
-		_saveLoadFlag = 0;
-	}
-
 	return 0;
 }
 
@@ -1395,6 +1379,21 @@
 #pragma mark -
 
 int ScummEngine::go() {
+	// If requested, load a save game instead of running the boot script
+	if (_saveLoadFlag != 2 || !loadState(_saveLoadSlot, _saveTemporaryState)) {
+		int args[16];
+		memset(args, 0, sizeof(args));
+		args[0] = _bootParam;	
+
+		_saveLoadFlag = 0;
+		if (_gameId == GID_MANIAC && _demoMode)
+			runScript(9, 0, 0, args);
+		else
+			runScript(1, 0, 0, args);
+	} else {
+		_saveLoadFlag = 0;
+	}
+
 	int delta = 0;
 	int diff = _system->getMillis();