diff options
| author | Colin Snover | 2017-02-04 17:21:48 -0600 |
|---|---|---|
| committer | Colin Snover | 2017-04-22 13:01:36 -0500 |
| commit | a2c48eff4ca281158aa48e34ede29a53e0871807 (patch) | |
| tree | f2bb607bf992a4d43be4c63a5ca6a75f2b8a9c8a | |
| parent | 1ed185bbbb59891a906e316956f8b09419094ef3 (diff) | |
| download | scummvm-rg350-a2c48eff4ca281158aa48e34ede29a53e0871807.tar.gz scummvm-rg350-a2c48eff4ca281158aa48e34ede29a53e0871807.tar.bz2 scummvm-rg350-a2c48eff4ca281158aa48e34ede29a53e0871807.zip | |
SCI32: Only activate the Load button in the launcher when it is usable
| -rw-r--r-- | engines/sci/detection.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 272e3320b4..fa89aad404 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -22,6 +22,7 @@ #include "engines/advancedDetector.h" #include "base/plugins.h" +#include "common/config-manager.h" #include "common/file.h" #include "common/ptr.h" #include "common/savefile.h" @@ -883,13 +884,13 @@ Common::Error SciEngine::saveGameState(int slot, const Common::String &desc) { bool SciEngine::canLoadGameStateCurrently() { #ifdef ENABLE_SCI32 + const Common::String &guiOptions = ConfMan.get("guioptions"); if (getSciVersion() >= SCI_VERSION_2) { - switch (getGameId()) { - case GID_PHANTASMAGORIA: - case GID_HOYLE5: + if (ConfMan.getBool("originalsaveload") || + !Common::checkGameGUIOption(GAMEOPTION_ORIGINAL_SAVELOAD, guiOptions) || + Common::checkGameGUIOption(GUIO_NOLAUNCHLOAD, guiOptions)) { + return false; - default: - break; } } #endif |