aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2009-06-10 12:16:30 +0000
committerPaul Gilbert2009-06-10 12:16:30 +0000
commite487347921fc751a85b221fa7a8c9c455cc595d6 (patch)
tree9ed6510230a3152099ed222f079c72d1f7a75fb6
parentf2c1b182424f3e76ab72a770e8d3f059deb8e929 (diff)
downloadscummvm-rg350-e487347921fc751a85b221fa7a8c9c455cc595d6.tar.gz
scummvm-rg350-e487347921fc751a85b221fa7a8c9c455cc595d6.tar.bz2
scummvm-rg350-e487347921fc751a85b221fa7a8c9c455cc595d6.zip
Added support for loading savegames from the launcher
svn-id: r41424
-rw-r--r--engines/cruise/cruise_main.cpp3
-rw-r--r--engines/cruise/detection.cpp3
2 files changed, 5 insertions, 1 deletions
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index 136aa92b81..ea120ba05e 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -1739,6 +1739,9 @@ void CruiseEngine::mainLoop(void) {
int quitValue2 = 1;
int quitValue = 0;
+ if (ConfMan.hasKey("save_slot"))
+ loadGameState(ConfMan.getInt("save_slot"));
+
do {
// Handle frame delay
uint32 currentTick = g_system->getMillis();
diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp
index a0a8cce970..879fad0210 100644
--- a/engines/cruise/detection.cpp
+++ b/engines/cruise/detection.cpp
@@ -209,7 +209,8 @@ bool CruiseMetaEngine::hasFeature(MetaEngineFeature f) const {
(f == kSupportsListSaves) ||
(f == kSupportsDeleteSave) ||
(f == kSavesSupportMetaInfo) ||
- (f == kSavesSupportThumbnail);
+ (f == kSavesSupportThumbnail) ||
+ (f == kSupportsLoadingDuringStartup);
}
SaveStateList CruiseMetaEngine::listSaves(const char *target) const {