aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjohndoe1232013-01-29 12:19:46 +0000
committerWillem Jan Palenstijn2013-05-08 20:47:43 +0200
commita80bafeb2eb67756fc5765468c4c7ac3e1c024d4 (patch)
tree11630e15fa3a96c981bd3cf1f6cc6e3745dd854e
parentdc459b5f673207a932ae07546ab29efd5b64727a (diff)
downloadscummvm-rg350-a80bafeb2eb67756fc5765468c4c7ac3e1c024d4.tar.gz
scummvm-rg350-a80bafeb2eb67756fc5765468c4c7ac3e1c024d4.tar.bz2
scummvm-rg350-a80bafeb2eb67756fc5765468c4c7ac3e1c024d4.zip
NEVERHOOD: Support game loading from launcher/command line
-rw-r--r--engines/neverhood/detection.cpp2
-rw-r--r--engines/neverhood/neverhood.cpp5
2 files changed, 5 insertions, 2 deletions
diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp
index 043cf02723..1c88c34473 100644
--- a/engines/neverhood/detection.cpp
+++ b/engines/neverhood/detection.cpp
@@ -137,7 +137,7 @@ bool NeverhoodMetaEngine::hasFeature(MetaEngineFeature f) const {
return
(f == kSupportsListSaves) ||
(f == kSupportsLoadingDuringStartup) ||
-// (f == kSupportsDeleteSave) ||
+ (f == kSupportsDeleteSave) ||
(f == kSavesSupportMetaInfo) ||
(f == kSavesSupportThumbnail) ||
(f == kSavesSupportCreationDate) ||
diff --git a/engines/neverhood/neverhood.cpp b/engines/neverhood/neverhood.cpp
index 7b068bdf46..475a459df4 100644
--- a/engines/neverhood/neverhood.cpp
+++ b/engines/neverhood/neverhood.cpp
@@ -108,7 +108,10 @@ Common::Error NeverhoodEngine::run() {
(*navigationList)[5].middleFlag = 1;
}
- _gameModule->startup();
+ if (ConfMan.hasKey("save_slot"))
+ loadGameState(ConfMan.getInt("save_slot"));
+ else
+ _gameModule->startup();
mainLoop();