[Scummvm-git-logs] scummvm master -> f8c9ae004adeab4b8b2c3c9f31cbca677a0aafa8

[athrxx]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f8c9ae004a SCUMM: fix regression from 743343be


Commit: f8c9ae004adeab4b8b2c3c9f31cbca677a0aafa8
    https://github.com/scummvm/scummvm/commit/f8c9ae004adeab4b8b2c3c9f31cbca677a0aafa8
Author: athrxx (athrxx at scummvm.org)
Date: 2021-09-09T01:39:05+02:00

Commit Message:
SCUMM: fix regression from 743343be

(thanks to criezy)

Changed paths:
    engines/scumm/saveload.cpp


diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index eb36720f99..8ea688393d 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -132,8 +132,10 @@ bool ScummEngine::canSaveGameStateCurrently() {
 	// exception here. This the same forced overwriting of the
 	// script decisions as in ScummEngine::processKeyboard.
 	// Also, disable saving when a SAN video is playing.
-	if (_game.version >= 7)
-		return !((ScummEngine_v7 *)this)->isSmushActive();
+	if (_game.version >= 7 && ((ScummEngine_v7 *)this)->isSmushActive())
+		return false;
+	if (_game.id == GID_CMI)
+		return true;
 #endif
 
 	// SCUMM v4+ doesn't allow saving in room 0 or if