[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.551,2.552

James Brown ender at users.sourceforge.net
Fri Jan 16 08:30:08 CET 2004


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

Modified Files:
	scummvm.cpp 
Log Message:
Hack for Launcher Scaler dropdown. Backends using the Launcher will need to implement the OSystem HAS_SCALER property. The global options dialog still needs doing.



Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.551
retrieving revision 2.552
diff -u -d -r2.551 -r2.552
--- scummvm.cpp	16 Jan 2004 10:45:56 -0000	2.551
+++ scummvm.cpp	16 Jan 2004 16:28:56 -0000	2.552
@@ -991,7 +991,9 @@
 	if (_saveLoadFlag != 2 || !loadState(_saveLoadSlot, _saveLoadCompatible)) {
 		int args[16];
 		memset(args, 0, sizeof(args));
-		args[0] = _bootParam;		
+		args[0] = _bootParam;	
+
+		_saveLoadFlag = 0;
 		if (_gameId == GID_MANIAC && _version == 1 && _demoMode)
 			runScript(9, 0, 0, args);
 		else





More information about the Scummvm-git-logs mailing list