[Scummvm-git-logs] scummvm master -> 2806aee7ad7401b3558020f88b4913c3099be9d6

[dwatteau]

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:
2806aee7ad SCUMM: Mark Trac#1017 and Trac#1052 box workarounds as `kEnhGameBreakingBugFixes`


Commit: 2806aee7ad7401b3558020f88b4913c3099be9d6
    https://github.com/scummvm/scummvm/commit/2806aee7ad7401b3558020f88b4913c3099be9d6
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-03-06T18:31:20+01:00

Commit Message:
SCUMM: Mark Trac#1017 and Trac#1052 box workarounds as `kEnhGameBreakingBugFixes`

(The existing comments above that code explain why we differ from the originals
in this part of the code.)

Changed paths:
    engines/scumm/boxes.cpp


diff --git a/engines/scumm/boxes.cpp b/engines/scumm/boxes.cpp
index dec075eea7f..93c97f9efbf 100644
--- a/engines/scumm/boxes.cpp
+++ b/engines/scumm/boxes.cpp
@@ -786,7 +786,7 @@ int ScummEngine::getNextBox(byte from, byte to) {
 	// WORKAROUND #2: In addition to the above, we have to add this special
 	// case to fix the scene in Indy3 where Indy meets Hitler in Berlin.
 	// See bug #1017 and also bug #1052.
-	if ((_game.id == GID_INDY3) && _roomResource == 46 && from == 1 && to == 0)
+	if (_game.id == GID_INDY3 && _roomResource == 46 && from == 1 && to == 0 && enhancementEnabled(kEnhGameBreakingBugFixes))
 		return 0;
 
 	// Skip up to the matrix data for box 'from'