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

[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:
a68398c3d5 SCUMM: Make Trac#1315 workaround an enhancement and describe it more (Indy4)


Commit: a68398c3d599a2acaa5e0aef796f3bc80ccbfb4c
    https://github.com/scummvm/scummvm/commit/a68398c3d599a2acaa5e0aef796f3bc80ccbfb4c
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-09-11T18:27:51+02:00

Commit Message:
SCUMM: Make Trac#1315 workaround an enhancement and describe it more (Indy4)

This fixed a small box glitch in Atlantis, which also happened with the
original interpreter. This kind of fix is put in the "game-specific
enhancements" option, nowadays.

Tested with boot param 9904.

Changed paths:
    engines/scumm/boxes.cpp


diff --git a/engines/scumm/boxes.cpp b/engines/scumm/boxes.cpp
index 00c263e1235..44a7be6d346 100644
--- a/engines/scumm/boxes.cpp
+++ b/engines/scumm/boxes.cpp
@@ -172,9 +172,11 @@ byte ScummEngine::getMaskFromBox(int box) {
 	if (!ptr)
 		return 0;
 
-	// WORKAROUND for bug #1315: This is a bug in the data files, as it also
-	// occurs with the original engine. We work around it here anyway.
-	if (_game.id == GID_INDY4 && _currentRoom == 225 && _roomResource == 94 && box == 8)
+	// WORKAROUND for bug #1315: the wall sprite is drawn over Indy when he
+	// stands at a specific place near Nur-Ab-Sal's abode. This is a bug in
+	// the data files, as it also occurs with the original engine. We work
+	// around it here anyway.
+	if (_game.id == GID_INDY4 && _currentRoom == 225 && _roomResource == 94 && box == 8 && _enableEnhancements)
 		return 0;
 
 	if (_game.version == 8)