COMPOSER: Added loading from launcher support

scummvm · Oct 18, 2016 · 582006d · 582006d
1 parent 69a6a20
commit 582006d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp
@@ -169,7 +169,10 @@ Common::Error ComposerEngine::run() {
 		} else if (_needsUpdate) {
 			redraw();
 		}
-
+		if (ConfMan.hasKey("save_slot")) {
+			loadGameState(ConfMan.getInt("save_slot"));
+			ConfMan.removeKey("save_slot", Common::ConfigManager::kTransientDomain);
+		}
 		while (_eventMan->pollEvent(event)) {
 			switch (event.type) {
 			case Common::EVENT_LBUTTONDOWN:

diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp
@@ -464,7 +464,7 @@ bool ComposerMetaEngine::createInstance(OSystem *syst, Engine **engine, const AD
 }
 
 bool ComposerMetaEngine::hasFeature(MetaEngineFeature f) const {
-	return (f == kSupportsListSaves);
+	return ((f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup));
 }
 
 Common::String getSaveName(Common::InSaveFile *in) {