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

[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:
ffa7e807d5 SCUMM: Properly flag MI1 Smirk close-up enhancement


Commit: ffa7e807d5d2a2ca2498ff8ff61b5ab75055e9d5
    https://github.com/scummvm/scummvm/commit/ffa7e807d5d2a2ca2498ff8ff61b5ab75055e9d5
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2023-12-31T15:30:26+01:00

Commit Message:
SCUMM: Properly flag MI1 Smirk close-up enhancement

The part where the colors are remapped to get them right for Smirk's
cigar smoke was always run. Now it's only run when the enhancement is
enabled. This makes no visible difference, since those colors are only
used by the cigar smoke, and when the enhancement isn't enabled the
cigar smoke isn't drawn. But it's still the right thing to do.

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index a26e8762d6d..a4f4ad71d3b 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -554,7 +554,7 @@ void ScummEngine_v5::o5_actorOps() {
 			// but for the Smirk close-up we want the same colors
 			// as the floppy version.
 
-			if (_game.id == GID_MONKEY && _currentRoom == 76) {
+			if (_game.id == GID_MONKEY && _currentRoom == 76 && enhancementEnabled(kEnhVisualChanges)) {
 				if (i == 3)
 					i = 1;
 				else if (i == 9)