[Scummvm-git-logs] scummvm master -> 88aaf2ce4d47cde9e099dbd10a0a7eca53f0c949

[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:
88aaf2ce4d SCUMM: Make Fate of Atlantis intro workaround optional.


Commit: 88aaf2ce4d47cde9e099dbd10a0a7eca53f0c949
    https://github.com/scummvm/scummvm/commit/88aaf2ce4d47cde9e099dbd10a0a7eca53f0c949
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-04-06T10:14:41+02:00

Commit Message:
SCUMM: Make Fate of Atlantis intro workaround optional.

I didn't create this workaround, but I think it makes sense to make it
(ensuring that the window is broken and the coat is there even if you
skip the intro) optional.

Changed paths:
    engines/scumm/detection.cpp
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 5d7bdc91987..f805adfc50e 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -227,7 +227,8 @@ const ExtraGuiOptions ScummMetaEngineDetection::getExtraGuiOptions(const Common:
 		gameid == "monkey2" ||
 		gameid == "samnmax" ||
 		gameid == "loom" ||
-		(gameid == "indy3" && platform == Common::kPlatformMacintosh && extra != "Steam")) {
+		(gameid == "indy3" && platform == Common::kPlatformMacintosh && extra != "Steam") ||
+		gameid == "atlantis") {
 		options.push_back(enableEnhancements);
 	}
 
diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 1134409a0bb..200574d0a39 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -1491,7 +1491,7 @@ void ScummEngine_v5::o5_loadRoom() {
 	// the one where Indy enters the office for the first time. If object 23 (National
 	// Archeology) is in possession of Indy (owner == 1) then it's safe to force the
 	// coat (object 24) and broken window (object 25) into the room.
-	if (_game.id == GID_INDY4 && room == 1 && _objectOwnerTable[23] == 1) {
+	if (_game.id == GID_INDY4 && room == 1 && _objectOwnerTable[23] == 1 && _enableEnhancements) {
 		putState(24, 1);
 		putState(25, 1);
 	}