diff options
| author | upthorn | 2012-06-23 03:03:52 -0700 |
|---|---|---|
| committer | angstsmurf | 2016-10-18 02:12:04 +0200 |
| commit | 582006d1cf8cca321ffcd02bba86f828156c088a (patch) | |
| tree | 8d74735cbd46e55ef89f59b6be9c4f49c46368a4 /engines | |
| parent | 69a6a200a21083b1ee7970d82fad0384a64bdcef (diff) | |
| download | scummvm-rg350-582006d1cf8cca321ffcd02bba86f828156c088a.tar.gz scummvm-rg350-582006d1cf8cca321ffcd02bba86f828156c088a.tar.bz2 scummvm-rg350-582006d1cf8cca321ffcd02bba86f828156c088a.zip | |
COMPOSER: Added loading from launcher support
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/composer/composer.cpp | 5 | ||||
| -rw-r--r-- | engines/composer/detection.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp index e9a91b1a25..e5b42361eb 100644 --- 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 index bd0c4323fe..8de3b33134 100644 --- 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) { |