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

[thebluegr at users.sourceforge.net]

Revision: 50864
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50864&view=rev
Author:   thebluegr
Date:     2010-07-14 02:12:58 +0000 (Wed, 14 Jul 2010)

Log Message:
-----------
Fixed loading saved games from the launcher, broken in rev. 50831

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

Modified: scummvm/trunk/engines/sci/engine/kfile.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kfile.cpp	2010-07-14 02:12:03 UTC (rev 50863)
+++ scummvm/trunk/engines/sci/engine/kfile.cpp	2010-07-14 02:12:58 UTC (rev 50864)
@@ -603,11 +603,15 @@
 
 	debug(3, "kRestoreGame(%s,%d)", game_id.c_str(), savegameId);
 
-	if ((savegameId < 1000) || (savegameId > 1999)) {
-		warning("Savegame ID %d is not allowed", savegameId);
-		return TRUE_REG;
+	if (argv[0].isNull()) {
+		// Loading from the launcher, don't adjust the ID of the saved game
+	} else {
+		if ((savegameId < 1000) || (savegameId > 1999)) {
+			warning("Savegame ID %d is not allowed", savegameId);
+			return TRUE_REG;
+		}
+		savegameId -= 1000;
 	}
-	savegameId -= 1000;
 
 	Common::Array<SavegameDesc> saves;
 	listSavegames(saves);


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