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

[lordhoto at users.sourceforge.net]

Revision: 40890
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40890&view=rev
Author:   lordhoto
Date:     2009-05-25 13:40:46 +0000 (Mon, 25 May 2009)

Log Message:
-----------
Till we specify an common behavior when loading a game state on startup fails / the user tries to load an non existing save slot, change Tinsel to start up the game as if no slot was specified. (This 'fixes' bug #2796215 "DW: Black screen when loading via command line")

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

Modified: scummvm/trunk/engines/tinsel/tinsel.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/tinsel.cpp	2009-05-25 13:25:31 UTC (rev 40889)
+++ scummvm/trunk/engines/tinsel/tinsel.cpp	2009-05-25 13:40:46 UTC (rev 40890)
@@ -972,12 +972,12 @@
 
 	// Load game from specified slot, if any
 	//
-	// TODO: We might want to think about taking care of possible errors
-	// when loading the save state.
+	// TODO: We might want to think about properly taking care of possible
+	// errors when loading the save state.
 
 	if (ConfMan.hasKey("save_slot")) {
-		loadGameState(ConfMan.getInt("save_slot"));
-		loadingFromGMM = true;
+		if (loadGameState(ConfMan.getInt("save_slot")) == Common::kNoError)
+			loadingFromGMM = true;
 	}
 
 	// Foreground loop


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