From c3041ad99b9e6bf87de7d16defb5b5a255f44745 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 20 Dec 2008 23:11:56 +0000
Subject: Implemented support for loading saves from launcher / via command
 line.

svn-id: r35454
---
 engines/tinsel/detection.cpp | 1 +
 engines/tinsel/tinsel.cpp    | 8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp
index 5b22659d26..ec1a6310ef 100644
--- a/engines/tinsel/detection.cpp
+++ b/engines/tinsel/detection.cpp
@@ -463,6 +463,7 @@ public:
 bool TinselMetaEngine::hasFeature(MetaEngineFeature f) const {
 	return 
 		(f == kSupportsListSaves) ||
+		(f == kSupportsLoadingDuringStartup) ||
 		(f == kSupportsDeleteSave);
 }
 
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index a7906a3ed1..e9bd50e142 100644
--- a/engines/tinsel/tinsel.cpp
+++ b/engines/tinsel/tinsel.cpp
@@ -991,13 +991,9 @@ Common::Error TinselEngine::go() {
 
 	//dumpMusic();	// dumps all of the game's music in external XMIDI files
 
-#if 0
 	// Load game from specified slot, if any
-	// FIXME: Not working correctly right now
-	if (ConfMan.hasKey("save_slot")) {
-		RestoreGame(ConfMan.getInt("save_slot"), true);
-	}
-#endif
+	if (ConfMan.hasKey("save_slot"))
+		loadGameState(ConfMan.getInt("save_slot"));
 
 	// Foreground loop
 
-- 
cgit v1.2.3