aboutsummaryrefslogtreecommitdiff
path: root/engines/tinsel
diff options
context:
space:
mode:
authorJohannes Schickel2008-12-21 00:48:23 +0000
committerJohannes Schickel2008-12-21 00:48:23 +0000
commitcba892a61b2449192dbf9db9d9502ead6d9be633 (patch)
tree6bacdd4bf6713767a23450ed9bcaa04341823864 /engines/tinsel
parentf3f93da8b8a2770d830e7b66ae76fdd028adeaed (diff)
downloadscummvm-rg350-cba892a61b2449192dbf9db9d9502ead6d9be633.tar.gz
scummvm-rg350-cba892a61b2449192dbf9db9d9502ead6d9be633.tar.bz2
scummvm-rg350-cba892a61b2449192dbf9db9d9502ead6d9be633.zip
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
Diffstat (limited to 'engines/tinsel')
-rw-r--r--engines/tinsel/detection.cpp3
-rw-r--r--engines/tinsel/tinsel.cpp8
2 files changed, 10 insertions, 1 deletions
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