From cba892a61b2449192dbf9db9d9502ead6d9be633 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 21 Dec 2008 00:48:23 +0000
Subject: Disable loading from command line again, it seems it only worked for
 saves, which did a cd change in DW2 and I only tested those by chance.

svn-id: r35456
---
 engines/tinsel/detection.cpp | 3 +++
 engines/tinsel/tinsel.cpp    | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp
index e5c5678435..4cae5885b5 100644
--- a/engines/tinsel/detection.cpp
+++ b/engines/tinsel/detection.cpp
@@ -463,7 +463,10 @@ public:
 bool TinselMetaEngine::hasFeature(MetaEngineFeature f) const {
 	return 
 		(f == kSupportsListSaves) ||
+		// TODO: See tinsel.cpp ll 994-1005
+#if 0
 		(f == kSupportsLoadingDuringStartup) ||
+#endif
 		(f == kSupportsDeleteSave);
 }
 
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index ddfde0df6d..eab2844a4e 100644
--- a/engines/tinsel/tinsel.cpp
+++ b/engines/tinsel/tinsel.cpp
@@ -995,8 +995,14 @@ Common::Error TinselEngine::go() {
 	//
 	// TODO: We might want to think about taking care of possible errors
 	// when loading the save state.
-	if (ConfMan.hasKey("save_slot"))
+	//
+	// TODO: This works fine when loading saves, which require a CD change
+	// in DW2. For every other save it'll fail though.
+#if 0
+	if (ConfMan.hasKey("save_slot")) {
 		loadGameState(ConfMan.getInt("save_slot"));
+	}
+#endif
 
 	// Foreground loop
 
-- 
cgit v1.2.3