diff options
| author | Walter van Niftrik | 2017-03-04 16:44:15 +0100 |
|---|---|---|
| committer | Walter van Niftrik | 2017-03-05 21:16:58 +0100 |
| commit | 3beb48f5ced89ba5521d5f6729534332db6b76d9 (patch) | |
| tree | 941e2886c0b0e8dcb43a97123cfe7dd375173624 /engines | |
| parent | 494682de90e7fb0d01cdd32c473e58b564f25eaf (diff) | |
| download | scummvm-rg350-3beb48f5ced89ba5521d5f6729534332db6b76d9.tar.gz scummvm-rg350-3beb48f5ced89ba5521d5f6729534332db6b76d9.tar.bz2 scummvm-rg350-3beb48f5ced89ba5521d5f6729534332db6b76d9.zip | |
ADL: Fix error() when opening GMM during intro
This is a regression from 516815d
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/adl/adl_v2.cpp | 3 | ||||
| -rw-r--r-- | engines/adl/hires6.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/engines/adl/adl_v2.cpp b/engines/adl/adl_v2.cpp index dfc2df6ef4..6eb26c515e 100644 --- a/engines/adl/adl_v2.cpp +++ b/engines/adl/adl_v2.cpp @@ -634,6 +634,9 @@ int AdlEngine_v2::o2_initDisk(ScriptEnv &e) { } bool AdlEngine_v2::canSaveGameStateCurrently() { + if (!_canSaveNow) + return false; + // Back up first visit flag as it may be changed by this test const bool isFirstTime = getCurRoom().isFirstTime; const bool retval = AdlEngine::canSaveGameStateCurrently(); diff --git a/engines/adl/hires6.cpp b/engines/adl/hires6.cpp index 02ef0f022a..a8d2f3f88c 100644 --- a/engines/adl/hires6.cpp +++ b/engines/adl/hires6.cpp @@ -206,6 +206,9 @@ int HiRes6Engine::o_fluteSound(ScriptEnv &e) { } bool HiRes6Engine::canSaveGameStateCurrently() { + if (!_canSaveNow) + return false; + // Back up variables that may be changed by this test const byte var2 = getVar(2); const byte var24 = getVar(24); |