ADL: Fix error() when opening GMM during intro

This is a regression from 516815d
scummvm · Mar 5, 2017 · 3beb48f · 3beb48f
1 parent 494682d
commit 3beb48f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -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);