[Scummvm-git-logs] scummvm master -> 8b10066bda80d2dec21e5270d66c88ef33123b68

[eriktorbjorn]

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:
8b10066bda SCUMM: Fix compiling without SCUMM v7/8


Commit: 8b10066bda80d2dec21e5270d66c88ef33123b68
    https://github.com/scummvm/scummvm/commit/8b10066bda80d2dec21e5270d66c88ef33123b68
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-08-10T19:13:50+02:00

Commit Message:
SCUMM: Fix compiling without SCUMM v7/8

Changed paths:
    engines/scumm/saveload.cpp


diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 15857ffc44..46833d6578 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -126,6 +126,7 @@ bool ScummEngine::canSaveGameStateCurrently() {
 	if (_game.heversion >= 62)
 		return false;
 
+#ifdef ENABLE_SCUMM_7_8
 	// COMI always disables saving/loading (to tell the truth:
 	// the main menu) via its scripts, thus we need to make an
 	// exception here. This the same forced overwriting of the
@@ -133,6 +134,7 @@ bool ScummEngine::canSaveGameStateCurrently() {
 	// Also, disable saving when a SAN video is playing.
 	if (_game.id == GID_CMI)
 		return !((ScummEngine_v7 *)this)->isSmushActive();
+#endif
 
 	// SCUMM v4+ doesn't allow saving in room 0 or if
 	// VAR(VAR_MAINMENU_KEY) to set to zero.