[Scummvm-cvs-logs] SF.net SVN: scummvm:[50460] scummvm/trunk/engines/sci/sci.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Mon Jun 28 22:58:33 CEST 2010


Revision: 50460
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50460&view=rev
Author:   thebluegr
Date:     2010-06-28 20:58:32 +0000 (Mon, 28 Jun 2010)

Log Message:
-----------
Fixed loading of saved games from the launcher

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sci.cpp

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-06-28 20:55:28 UTC (rev 50459)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-06-28 20:58:32 UTC (rev 50460)
@@ -236,8 +236,9 @@
 	debug("Emulating SCI version %s\n", getSciVersionDesc(getSciVersion()));
 
 	// Check whether loading a savestate was requested
-	if (ConfMan.hasKey("save_slot")) {
-		reg_t restoreArgv[2] = { NULL_REG, make_reg(0, ConfMan.getInt("save_slot")) };	// special call (argv[0] is NULL)
+	int saveSlot = ConfMan.getInt("save_slot");
+	if (saveSlot >= 0) {
+		reg_t restoreArgv[2] = { NULL_REG, make_reg(0, saveSlot) };	// special call (argv[0] is NULL)
 		kRestoreGame(_gamestate, 2, restoreArgv);
 
 		// Initialize the game menu, if there is one.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list